smash_and_grab 0.0.5alpha → 0.0.6alpha

data/test/smash_and_grab/map/map_test.rb

@@ -7,9 +7,10 @@ describe SmashAndGrab::Map do
             "class" => "entity",
             "type" => "professor_goggles",
             "id" => 0,
-            "health" => 8,
+            "health" => 5,
+            "contents_id" => nil,
             "movement_points" => 7,
-            "action_points" => 1,
+            "action_points" => 2,
             "facing" => "left",
             "tile" => [
                 1,
@@ -62,7 +63,11 @@ describe SmashAndGrab::Map do
     }
   end
 
-  subject { SmashAndGrab::Map.new map_data.symbolize }
+  helper :factions do
+    [SmashAndGrab::Factions::Faction.new] * 3
+  end
+
+  subject { SmashAndGrab::Map.new map_data.symbolize, factions, start: false }
 
   describe "#tile_at_grid" do
     should "find the correct tile" do
@@ -101,7 +106,7 @@ describe SmashAndGrab::Map do
   end
 
   describe "#save_data" do
-    subject { SmashAndGrab::Map.new(map_data.symbolize).save_data }
+    subject { SmashAndGrab::Map.new(map_data.symbolize, factions, start: false).save_data }
 
     should "contain the same data as was loaded" do
       subject[:version].should.equal SmashAndGrab::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smash_and_grab
 version: !ruby/object:Gem::Version
-  version: 0.0.5alpha
+  version: 0.0.6alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &23823180 !ruby/object:Gem::Requirement
+  requirement: &30704208 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *23823180
+  version_requirements: *30704208
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &23821236 !ruby/object:Gem::Requirement
+  requirement: &30703932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *23821236
+  version_requirements: *30703932
 - !ruby/object:Gem::Dependency
   name: fidgit
-  requirement: &23836032 !ruby/object:Gem::Requirement
+  requirement: &30703572 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *23836032
+  version_requirements: *30703572
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &23834916 !ruby/object:Gem::Requirement
+  requirement: &30703236 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *23834916
+  version_requirements: *30703236
+- !ruby/object:Gem::Dependency
+  name: r18n-desktop
+  requirement: &30702960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.14
+  type: :runtime
+  prerelease: false
+  version_requirements: *30702960
 - !ruby/object:Gem::Dependency
   name: releasy
-  requirement: &23832384 !ruby/object:Gem::Requirement
+  requirement: &30702684 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *23832384
+  version_requirements: *30702684
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23830980 !ruby/object:Gem::Requirement
+  requirement: &30702408 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *23830980
+  version_requirements: *30702408
 - !ruby/object:Gem::Dependency
   name: bacon-rr
-  requirement: &23830260 !ruby/object:Gem::Requirement
+  requirement: &30702132 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +98,7 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *23830260
+  version_requirements: *30702132
 description: ! 'Turn-based isometric heist game
 
 '
@@ -98,14 +109,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.txt
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/smash_and_grab
 - bin/smash_and_grab.rbw
 - config/gui/schema.yml
+- config/lang/objects/entities/en.yml
+- config/lang/objects/static/en.yml
+- config/lang/objects/vehicles/en.yml
 - config/levels/01_bank.sgl
 - config/map/entities.yml
 - config/map/objects.yml
@@ -116,14 +131,16 @@ files:
 - lib/smash_and_grab/abilities.rb
 - lib/smash_and_grab/abilities/ability.rb
 - lib/smash_and_grab/abilities/area.rb
+- lib/smash_and_grab/abilities/drop.rb
 - lib/smash_and_grab/abilities/melee.rb
 - lib/smash_and_grab/abilities/move.rb
+- lib/smash_and_grab/abilities/pick_up.rb
 - lib/smash_and_grab/abilities/ranged.rb
 - lib/smash_and_grab/abilities/sprint.rb
+- lib/smash_and_grab/chingu_ext/basic_game_object.rb
 - 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
@@ -149,6 +166,9 @@ files:
 - lib/smash_and_grab/map/map.rb
 - lib/smash_and_grab/map/tile.rb
 - lib/smash_and_grab/map/wall.rb
+- lib/smash_and_grab/mixins/has_contents.rb
+- lib/smash_and_grab/mixins/line_of_sight.rb
+- lib/smash_and_grab/mixins/pathfinding.rb
 - lib/smash_and_grab/mouse_selection.rb
 - lib/smash_and_grab/objects/entity.rb
 - lib/smash_and_grab/objects/floating_text.rb
@@ -156,7 +176,10 @@ files:
 - lib/smash_and_grab/objects/vehicle.rb
 - lib/smash_and_grab/objects/world_object.rb
 - lib/smash_and_grab/path.rb
+- lib/smash_and_grab/players/ai.rb
+- lib/smash_and_grab/players/human.rb
 - lib/smash_and_grab/players/player.rb
+- lib/smash_and_grab/players/remote.rb
 - lib/smash_and_grab/sprite_sheet.rb
 - lib/smash_and_grab/states/edit_level.rb
 - lib/smash_and_grab/states/main_menu.rb
@@ -182,12 +205,18 @@ files:
 - media/images/objects.png
 - media/images/path.png
 - media/images/tile_selection.png
+- media/images/tiles_selection.png
 - media/images/vehicles.png
 - media/images/walls.png
 - smash_and_grab.gemspec
+- tasks/create_portraits.rb
+- tasks/outline_images.rb
+- test/smash_and_grab/abilities/drop_test.rb
 - test/smash_and_grab/abilities/helpers/ability_helper.rb
 - test/smash_and_grab/abilities/melee_test.rb
 - test/smash_and_grab/abilities/move_test.rb
+- test/smash_and_grab/abilities/pick_up_test.rb
+- test/smash_and_grab/abilities/ranged_test.rb
 - test/smash_and_grab/abilities/sprint_test.rb
 - test/smash_and_grab/map/faction_test.rb
 - test/smash_and_grab/map/map_test.rb
@@ -221,8 +250,11 @@ signing_key:
 specification_version: 3
 summary: Turn-based isometric heist game
 test_files:
+- test/smash_and_grab/abilities/drop_test.rb
 - test/smash_and_grab/abilities/melee_test.rb
 - test/smash_and_grab/abilities/move_test.rb
+- test/smash_and_grab/abilities/pick_up_test.rb
+- test/smash_and_grab/abilities/ranged_test.rb
 - test/smash_and_grab/abilities/sprint_test.rb
 - test/smash_and_grab/map/faction_test.rb
 - test/smash_and_grab/map/map_test.rb

data/lib/smash_and_grab/fidgit_ext/event.rb

@@ -1,77 +0,0 @@
-module Fidgit
-  module Event
-    # Returned by {#subscribe} and can be used to {#unsubscribe}
-    class Subscription
-      attr_reader :publisher, :event, :handler
-
-      def initialize(publisher, event, handler)
-        @publisher, @event, @handler = publisher, event, handler
-      end
-
-      def unsubscribe
-        @publisher.unsubscribe self
-      end
-    end
-
-    class << self
-      def new_event_handlers
-        # Don't use Set, since it is not guaranteed to be ordered.
-        Hash.new {|h, k| h[k] = [] }
-      end
-    end
-
-    # @return [Subscription] Definition of this the handler created by this subscription, to be used with {#unsubscribe}
-    def subscribe(event, method = nil, &block)
-      raise ArgumentError, "Expected method or block for event handler" unless !block.nil? ^ !method.nil?
-      raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless events.include? event
-
-      @_event_handlers ||= Event.new_event_handlers
-      handler = method || block
-      @_event_handlers[event] << handler
-
-      Subscription.new self, event, handler
-    end
-
-    # @overload unsubscribe(subscription)
-    #   Unsubscribe from a #{Subscription}, as returned from {#subscribe}
-    #   @param subscription [Subscription]
-    #   @return [Boolean] true if the handler was able to be deleted.
-    #
-    # @overload unsubscribe(handler)
-    #   Unsubscribe from first event this handler has been used to subscribe to..
-    #   @param handler [Block, Method] Event handler used.
-    #   @return [Boolean] true if the handler was able to be deleted.
-    #
-    # @overload unsubscribe(event, handler)
-    #   Unsubscribe from specific handler on particular event.
-    #   @param event [Symbol] Name of event originally subscribed to.
-    #   @param handler [Block, Method] Event handler used.
-    #   @return [Boolean] true if the handler was able to be deleted.
-    #
-    def unsubscribe(*args)
-      @_event_handlers ||= Event.new_event_handlers
-
-      case args.size
-        when 1
-          case args.first
-            when Subscription
-              # Delete specific event handler.
-              subscription = args.first
-              raise ArgumentError, "Incorrect publisher for #{Subscription}: #{subscription.publisher}" unless subscription.publisher == self
-              unsubscribe subscription.event, subscription.handler
-            when Block, Method
-              # Delete first events that use the handler.
-              handler = args.first
-              !!@_event_handlers.find {|_, handlers| handlers.delete handler }
-            else
-              raise TypeError, "handler must be a #{Subscription}, Block or Method: #{args.first}"
-          end
-        when 2
-          event, handler = args
-          !!@_event_handlers[event].delete(handler)
-        else
-          raise ArgumentError, "Requires 1..2 arguments, but received #{args.size} arguments"
-      end
-    end
-  end
-end