smash_and_grab 0.0.3alpha → 0.0.5alpha

data/lib/smash_and_grab/objects/world_object.rb

@@ -5,11 +5,14 @@ class WorldObject < GameObject
   include Fidgit::Event
   extend Forwardable
 
+  event :changed
+
   def_delegators :@tile, :map, :grid_position, :grid_x, :grid_y
 
   attr_reader :tile
 
-  attr_accessor :z
+  attr_reader :z
+  def z=(z); @z = z; @recorded_shadow = nil; z; end
 
   def id; @map.id_for_object(self); end
   def blocks_sight?; true; end
@@ -46,6 +49,8 @@ class WorldObject < GameObject
 
     @tile << self if @tile
 
+    publish :changed if tile != @tile
+
     @tile
   end
 
@@ -78,15 +83,20 @@ class WorldObject < GameObject
       end
     end
 
-    @recorded_shadow.draw 0, 0, ZOrder::SHADOWS
+    @recorded_shadow.draw 0, 0, ZOrder::SHADOWS if casts_shadow?
 
-    @image.draw_rot @x, @y + 2.5, @y, 0, 0.5, 1, OUTLINE_SCALE * @factor_x, OUTLINE_SCALE
+    @image.draw_rot @x, @y + 2.5 - @z, @y, 0, 0.5, 1, OUTLINE_SCALE * @factor_x, OUTLINE_SCALE, color
   end
 
+  def busy?; false; end
+  def active?; false; end
+
   def destroy
     self.tile = nil
     map.remove self
 
+    publish :changed
+
     super
   end
 end

data/lib/smash_and_grab/path.rb

@@ -6,11 +6,14 @@ class Path
 
   TILE_SIZE = 16
 
+  class << self
+    def sprites; @sprites ||= SpriteSheet.new("path.png", 32, 16, 4); end
+  end
+
   attr_reader :cost, :move_distance, :previous_path, :destination_distance, :first, :last
 
   def accessible?; true; end
   def tiles; @previous_path.tiles + [@last]; end
-  def self.sprites; @@sprites ||= SpriteSheet.new("path.png", 32, 16, 4); end
   def sprites; self.class.sprites; end
 
   def initialize(previous_path, next_tile, extra_move_distance)
@@ -22,14 +25,17 @@ class Path
     @cost = @move_distance + @destination_distance
   end
 
-  def prepare_for_drawing(tiles_within_range)
+  # @option from [Tile] Tile to start drawing the path from.
+  def prepare_for_drawing(tiles_within_range, options = {})
     path_tiles = tiles
+    from = options[:from] || path_tiles.first
+    start_index = path_tiles.index from
 
     @record = $window.record(1, 1) do
-      tiles.each_with_index do |tile, i|
+      path_tiles[start_index..-1].each.with_index(start_index) do |tile, i|
         sheet_x, sheet_y =
             case tile
-              when @first
+              when from
                 case tile.direction_to(path_tiles[i + 1])
                   when :up then [3, 0]
                   when :down then [0, 0]
@@ -93,7 +99,7 @@ class Melee < Path
     super(previous_path, last, 0)
   end
 
-  def prepare_for_drawing(tiles_within_range)
+  def prepare_for_drawing(tiles_within_range, options = {})
     super(tiles_within_range)
     @draw_color = tiles_within_range.include?(last) ? COLOR_IN_RANGE : COLOR_OUT_OF_RANGE
   end
@@ -132,7 +138,7 @@ class Inaccessible < Path
     sprites[2, 1].draw_rot last.x, last.y, ZOrder::PATH, 0, 0.5, 0.5
   end
 
-  def prepare_for_drawing(tiles_within_range); end
+  def prepare_for_drawing(tiles_within_range, options = {}); end
 end
 
 # Path going to the same location as it started.
@@ -140,7 +146,7 @@ class None < Path
   def accessible?; false; end
   def tiles; []; end
   def initialize; end
-  def prepare_for_drawing(tiles_within_range); end
+  def prepare_for_drawing(tiles_within_range, options = {}); end
   def draw(*args); end
 end
 end

data/lib/smash_and_grab/players/player.rb

@@ -35,13 +35,12 @@ end
 # Local AI.
 class AI < Player
   def update
+    return if faction.map.busy?
+
     if @active_entities.empty?
       faction.end_turn
     else
-      @pause_until ||= Time.new 0
-      return unless Time.now >= @pause_until
-
-      # Attempt to attack, else move, else stand around like a loon.
+       # Attempt to attack, else move, else stand around like a loon.
       entity = @active_entities.first
       if entity.alive?
         moves, attacks = entity.potential_moves.partition {|t| t.empty? }
@@ -49,15 +48,21 @@ class AI < Player
         if attacks.any?
           # TODO: Pick the nearest attack and consider re-attacking.
           path = entity.path_to(attacks.sample)
-          faction.map.actions.do :ability, entity.ability(:move).action_data(path.previous_path) if path.requires_movement?
-          faction.map.actions.do :ability, entity.ability(:melee).action_data(path.last)
-          @active_entities.shift unless entity.ap > 0
-          @pause_until = Time.now + 0.5 unless @active_entities.empty?
+          entity.use_ability :move, path.previous_path if path.requires_movement?
+          # Only perform melee if you weren't killed by attacks of opportunity.
+          target = path.last.object
+          entity.add_activity do
+            entity.use_ability :melee, target if entity.alive?
+          end
+
+          entity.add_activity do
+            @active_entities.shift unless entity.use_ability?(:melee)
+          end
+
         elsif moves.any?
           # TODO: Wait with moves until everyone who can has attacked?
-          faction.map.actions.do :ability, entity.ability(:move).action_data(entity.path_to(moves.sample))
+          entity.use_ability :move, entity.path_to(moves.sample)
           @active_entities.shift
-          @pause_until = Time.now + 0.5 unless @active_entities.empty?
         else
           # Can't do anything at all :(
           # TODO: Maybe wait until other people have tried to move?

data/lib/smash_and_grab/states/edit_level.rb

@@ -3,6 +3,8 @@ require_relative 'world'
 module SmashAndGrab
 module States
 class EditLevel < World
+  PLACEMENT_COLOR = Color.rgba(255, 255, 255, 190)
+
   def initialize(file)
     super()
 
@@ -169,8 +171,23 @@ class EditLevel < World
           factor_x = (@hover_wall.orientation == :vertical) ? -1 : 1
           @mouse_hover_wall_image.draw_rot tile.x + offset_x, tile.y + offset_y, ZOrder::TILE_SELECTION, 0, 0.5, 0.5, factor_x
 
+          image = @selector.icon_for @selector.selected
+          if image
+            image.draw_rot tile.x, tile.y + 8, tile.y + 8, 0, 0.5, 1, -factor_x, 1, PLACEMENT_COLOR
+          end
+
         elsif @hover_tile
           @mouse_hover_tile_image.draw_rot @hover_tile.x, @hover_tile.y, ZOrder::TILE_SELECTION, 0, 0.5, 0.5
+
+          image = @selector.icon_for @selector.selected
+          if image
+            offset_y, scale, rel_x = if @selector.tab == :tiles
+                                       [0, 1, 0.5]
+                                     else
+                                       [2.5, 0.5, 1]
+                                     end
+            image.draw_rot @hover_tile.x, @hover_tile.y + offset_y, @hover_tile.y, 0, 0.5, rel_x, scale, scale, PLACEMENT_COLOR
+          end
         end
       end
     end

data/lib/smash_and_grab/states/play_level.rb

@@ -3,8 +3,13 @@ require_relative 'world'
 module SmashAndGrab
 module States
 class PlayLevel < World
+  include Fidgit::Event
+
   attr_reader :info_panel
 
+  event :game_info
+  event :game_heading
+
   def initialize(file)
     super()
 
@@ -19,6 +24,12 @@ class PlayLevel < World
     @players.each.with_index do |player, i|
       map.factions[i].player = player
       player.faction = map.factions[i]
+      player.faction.subscribe :turn_started do
+        publish :game_heading, "=== Turn #{map.turn + 1} ===" if player == @players.first
+        publish :game_info, ""
+        publish :game_heading, "#{player.faction}' turn (#{Inflector.demodulize player.class})"
+        publish :game_info, ""
+      end
     end
 
     save_game_as AUTOSAVE_FILE
@@ -36,15 +47,15 @@ class PlayLevel < World
           baddy = @map.baddies[i]
           summary = Gui::EntitySummary.new baddy, parent: packer
           summary.subscribe :left_mouse_button do
-            @mouse_selection.select baddy if baddy.alive?
-            @info_panel.entity = baddy
+            @mouse_selection.selected = baddy if baddy.alive?
+            @info_panel.object = baddy
           end
         end
       end
 
       # Info panel.
-      @info_panel = Gui::InfoPanel.new parent: container
-      @info_panel.entity = @map.baddies[0]
+      @info_panel = Gui::InfoPanel.new self, parent: container
+      @info_panel.object = @map.baddies[0]
 
       # Button box.
       @button_box = vertical parent: container, padding: 4, spacing: 8, width: 150, background_color: Color::BLACK do
@@ -70,23 +81,22 @@ class PlayLevel < World
   end
 
   def end_turn
-    @mouse_selection.select nil
     @map.active_faction.end_turn
     save_game_as AUTOSAVE_FILE
   end
 
   def undo_action
     selection = @mouse_selection.selected
-    @mouse_selection.select nil
+    @mouse_selection.selected = nil
     @map.actions.undo if @map.actions.can_undo?
-    @mouse_selection.select selection if selection
+    @mouse_selection.selected = selection if selection
   end
 
   def redo_action
     selection = @mouse_selection.selected
-    @mouse_selection.select nil
+    @mouse_selection.selected = nil
     @map.actions.redo if @map.actions.can_redo?
-    @mouse_selection.select selection if selection
+    @mouse_selection.selected =sd selection if selection
   end
 
   def map=(map)
@@ -121,7 +131,7 @@ class PlayLevel < World
       nil
     end
 
-    @info_panel.entity = @mouse_selection.selected
+    @info_panel.object = @mouse_selection.selected
 
     @mouse_selection.update
 

data/lib/smash_and_grab/version.rb

@@ -1,3 +1,3 @@
 module SmashAndGrab
-  VERSION = "0.0.3alpha"
+  VERSION = "0.0.5alpha"
 end

data/lib/smash_and_grab.rb

@@ -1,22 +1,26 @@
 require 'optparse'
+require 'fileutils'
 
 begin
-  EXTRACT_PATH = File.dirname(File.dirname(File.expand_path(__FILE__)))
-
-  ROOT_PATH = if ENV['OCRA_EXECUTABLE']
-                File.dirname(File.expand_path(ENV['OCRA_EXECUTABLE']))
-              elsif defined? OSX_EXECUTABLE_FOLDER
-                File.dirname(OSX_EXECUTABLE_FOLDER)
-              else
-                EXTRACT_PATH
-              end
+  # Path script running from.
+  EXTRACT_PATH = File.expand_path("../..", __FILE__)
 
+  # Name of app, such as my_application
   APP_NAME = File.basename(__FILE__).chomp(File.extname(__FILE__))
 
-  RUNNING_FROM_EXECUTABLE = (ENV['OCRA_EXECUTABLE'] or defined?(OSX_EXECUTABLE))
+  RUNNING_FROM_EXECUTABLE = (ENV['OCRA_EXECUTABLE'] or ENV['RELEASY_OSX_APP'])
+
+  # Path to logs, save games, user config, etc.
+  USER_DATA_PATH = if ENV['APPDATA']
+                     File.join(ENV['APPDATA'].gsub("\\", "/"), APP_NAME.split("_").map(&:capitalize).join(" ").gsub(" And ", " and "))
+                   else
+                     File.expand_path("~/.#{APP_NAME}")
+                   end
+
+  FileUtils.mkdir_p USER_DATA_PATH
 
-  DEFAULT_LOG_FILE = "#{APP_NAME}.log"
-  DEFAULT_LOG_FILE_PATH = File.join(ROOT_PATH, DEFAULT_LOG_FILE)
+  DEFAULT_LOG_FILE = "log.txt"
+  DEFAULT_LOG_FILE_PATH = File.join(USER_DATA_PATH, DEFAULT_LOG_FILE)
 
   def parse_options
     options = {}
@@ -25,7 +29,7 @@ begin
       parser.banner =<<TEXT
 Usage: #{File.basename(__FILE__)} [options]
 
-  Defaults to using --#{RUNNING_FROM_EXECUTABLE ? 'log' : 'console'}
+  Defaults to using --#{RUNNING_FROM_EXECUTABLE ? "log '#{DEFAULT_LOG_FILE}'" : 'console'}
 
 TEXT
 
@@ -93,7 +97,7 @@ TEXT
     $stdout.sync = true
   end
 
-  require_relative "smash_and_grab/main"
+  require_relative "#{APP_NAME}/main"
 
   exit_message = ""
 

data/test/smash_and_grab/abilities/melee_test.rb

@@ -2,20 +2,23 @@ require_relative "../../teststrap"
 require_relative "helpers/ability_helper"
 
 describe SmashAndGrab::Abilities::Melee do
-  helper(:entity) {@entity ||= Object.new }
-  helper(:enemy) { @enemy ||= Object.new }
-  helper(:tile) { @tile ||= SmashAndGrab::Tile.new(:grass, nil, 1, 1) }
+  before do
+    @entity = Object.new
+    @enemy = Object.new
+    @map = Object.new
+    @tile = SmashAndGrab::Tile.new(:grass, nil, 1, 2)
+  end
 
-  subject { SmashAndGrab::Abilities.ability entity, type: :melee, action_cost: 1, skill: 5 }
+  subject { SmashAndGrab::Abilities.ability @entity, type: :melee, action_cost: 1, skill: 5 }
 
   behaves_like SmashAndGrab::Abilities::Ability
 
   should "fail if not given the required arguments" do
-    ->{ SmashAndGrab::Abilities.ability entity, type: :melee }.should.raise(ArgumentError).message.should.match /No skill value for/
+    ->{ SmashAndGrab::Abilities.ability @entity, type: :melee }.should.raise(ArgumentError).message.should.match /No skill value for/
   end
 
   should "be initialized" do
-    subject.owner.should.equal entity
+    subject.owner.should.equal @entity
     subject.can_be_undone?.should.be.false
     subject.skill.should.equal 5
     subject.action_cost.should.equal 1
@@ -30,18 +33,19 @@ describe SmashAndGrab::Abilities::Melee do
   end
 
   should "generate appropriate action_data" do
-    stub(entity).id.returns 12
-    stub(enemy).id.returns 13
-    stub(tile).object.returns enemy
+    stub(@entity).id.returns 12
+    stub(@enemy).id.returns 13
+    stub(@enemy).tile.returns @tile
+    stub(@tile).object.returns @enemy
     stub(subject).random_damage.returns 5
-    subject.action_data(tile).should.equal(
+    subject.action_data(@enemy).should.equal(
         ability: :melee,
         skill: 5,
         action_cost: 1,
 
         owner_id: 12,
         target_id: 13,
-        target_position: [1, 1],
+        target_position: [1, 2],
         damage: 5
     )
   end
@@ -60,46 +64,40 @@ describe SmashAndGrab::Abilities::Melee do
 
   describe "#do" do
     should "remove action points and health" do
-      stub(enemy).health.returns 20
-      mock(enemy, :health=).with 15
-
-      stub(entity).map.stub!.object_by_id(13).returns enemy
-      stub(entity).action_points.returns 1
-      mock(entity, :action_points=).with 0
+      stub(@entity).map.stub!.object_by_id(13).returns @enemy
+      stub(@entity).action_points.returns 1
+      mock(@entity).action_points = 0
+      mock(@entity).melee(@enemy, 5)
 
-      subject.do action_cost: 1, target_id: 13, damage: 5 #, target_position: [1, 1]
-      true
+      subject.do action_cost: 1, target_id: 13, damage: 5 #, target_position: [1, 2]
     end
   end
 
   describe "#undo" do
     should "give action points and health (if target alive)" do
-      stub(enemy).tile.returns tile
-      stub(enemy).health.returns 15
-      mock(enemy, :health=).with 20
-
-      stub(entity).map.stub!.object_by_id(13).returns enemy
-      stub(entity).action_points.returns 0
-      mock(entity, :action_points=).with 1
+      stub(@enemy).tile.returns @tile
+      stub(@entity).map.stub!.object_by_id(13).returns @enemy
+      stub(@entity).action_points.returns 0
+      mock(@entity).action_points = 1
+      mock(@entity).melee(@enemy, -5)
 
-      subject.undo action_cost: 1, target_id: 13, damage: 5, target_position: [1, 1]
+      subject.undo action_cost: 1, target_id: 13, damage: 5, target_position: [1, 2]
     end
 
     should "give action points, health and return to map (if target dead)" do
-      stub(enemy).tile.returns nil
-      stub(enemy).health.returns 0
-      mock(enemy, :tile=).with tile
-      mock(enemy, :health=).with 5
-
-      stub(entity).map do
-        map = Object.new
-        stub(map).object_by_id(13).returns enemy
-        stub(map).tile_at_grid([1, 1]).returns tile
+      stub(@enemy).tile.returns nil
+      mock(@enemy).tile = @tile
+      mock(@entity).melee(@enemy, -5)
+
+      stub(@entity).map do
+        stub(@map).object_by_id(13).returns @enemy
+        stub(@map).tile_at_grid([1, 2]).returns @tile
+        @map
       end
-      stub(entity).action_points.returns 0
-      mock(entity, :action_points=).with 1
+      stub(@entity).action_points.returns 0
+      mock(@entity).action_points = 1
 
-      subject.undo action_cost: 1, target_id: 13, damage: 5, target_position: [1, 1]
+      subject.undo action_cost: 1, target_id: 13, damage: 5, target_position: [1, 2]
     end
   end
 end

data/test/teststrap.rb

@@ -2,11 +2,11 @@ require 'bacon'
 require 'bacon/rr'
 
 DEVELOPMENT_MODE = true
-ROOT_PATH = EXTRACT_PATH = File.expand_path("../../", __FILE__)
 
-require_relative '../lib/smash_and_grab'
+require_relative '../lib/smash_and_grab/log'
+SmashAndGrab::Log.level = :ERROR # Don't print out junk.
 
-SmashAndGrab::Log.level = :WARNING # Don't print out junk.
+require_relative '../lib/smash_and_grab'
 
 module Bacon
   class Context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smash_and_grab
 version: !ruby/object:Gem::Version
-  version: 0.0.3alpha
+  version: 0.0.5alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &21545124 !ruby/object:Gem::Requirement
+  requirement: &23823180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *21545124
+  version_requirements: *23823180
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &21542760 !ruby/object:Gem::Requirement
+  requirement: &23821236 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *21542760
+  version_requirements: *23821236
 - !ruby/object:Gem::Dependency
   name: fidgit
-  requirement: &21762120 !ruby/object:Gem::Requirement
+  requirement: &23836032 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *21762120
+  version_requirements: *23836032
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &21760344 !ruby/object:Gem::Requirement
+  requirement: &23834916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *21760344
+  version_requirements: *23834916
 - !ruby/object:Gem::Dependency
   name: releasy
-  requirement: &21757944 !ruby/object:Gem::Requirement
+  requirement: &23832384 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *21757944
+  version_requirements: *23832384
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21773784 !ruby/object:Gem::Requirement
+  requirement: &23830980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *21773784
+  version_requirements: *23830980
 - !ruby/object:Gem::Dependency
   name: bacon-rr
-  requirement: &21771324 !ruby/object:Gem::Requirement
+  requirement: &23830260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *21771324
+  version_requirements: *23830260
 description: ! 'Turn-based isometric heist game
 
 '
@@ -123,12 +123,17 @@ files:
 - lib/smash_and_grab/fidgit_ext/container.rb
 - lib/smash_and_grab/fidgit_ext/cursor.rb
 - lib/smash_and_grab/fidgit_ext/element.rb
+- lib/smash_and_grab/fidgit_ext/event.rb
 - lib/smash_and_grab/game_window.rb
 - lib/smash_and_grab/gosu_ext/font.rb
 - lib/smash_and_grab/gui/editor_selector.rb
+- lib/smash_and_grab/gui/entity_panel.rb
 - lib/smash_and_grab/gui/entity_summary.rb
+- lib/smash_and_grab/gui/game_log.rb
 - lib/smash_and_grab/gui/info_panel.rb
 - lib/smash_and_grab/gui/minimap.rb
+- lib/smash_and_grab/gui/object_panel.rb
+- lib/smash_and_grab/gui/scenario_panel.rb
 - lib/smash_and_grab/history/action_history.rb
 - lib/smash_and_grab/history/editor_action_history.rb
 - lib/smash_and_grab/history/editor_actions/erase_object.rb