gemwarrior 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda7d7def18d2c9269e29addbe19238f1eb8c6b6
-  data.tar.gz: 4779a9b6f56d7312e8e73f400490d7c4bf08b854
+  metadata.gz: 802e8eb109de45ef2c968edc3fb59a7cf7653ff5
+  data.tar.gz: fb8400dcd4e0fc1e877702c529ecc4e3ee3dd220
 SHA512:
-  metadata.gz: 579de55cd563d14b6efa1a74289d9ad8c2f0fa3097ddffd9ddac2e573d685c5926b02ff831a29b7a5827670b1d89061f666f8d0eacd2a2ee3b69e2c864dadb6e
-  data.tar.gz: e8a8e153c8a442b11a6c8340783d3f69d591bf187993da3893c16a6b2eb27c293da213815a14f5e6da0e15a5d865ddea5a298c0995c8e6e0d63dbaef4a1de008
+  metadata.gz: e1c9a822d15ff61e3867d2829be1bfd8127603201e69396afca0fb68deded08e11d32ade379a9d07ba5a90ce363c2dccb34420bbcf733294c26cf1be38e5da80
+  data.tar.gz: d15377a5acae4b68cf4518b8290fd0ce5e5664d02d581026c4be30d81cdc404db9ed4fc6d7eda3254177c5245ef2c8295d7bf671c6865523c0392b35a95533af

data/lib/gemwarrior/entities/items/massive_door.rb

@@ -18,7 +18,7 @@ module Gemwarrior
 
     def use(player = nil)
       puts 'You attempt to open the seriously massive door that separates you from Emerald himself.'
-      if player.inventory.has_item?('keystone')
+      if player.inventory.contains_item?('keystone')
         puts 'The keystone in your inventory glows as you approach the incredibly titanic-sized door, so you naturally pull it out and thrust it into the stone-shaped depression within the cloudy obstruction. The door "opens" in a way and you can now pass through.'
         {:type => 'move', :data => 'Sky Tower (Throne Room)'}
       else

data/lib/gemwarrior/entities/player.rb

@@ -108,7 +108,7 @@ module Gemwarrior
 
       Animation::run({:phrase => '** Zzzzz **'})
 
-      if self.inventory.has_item?('tent') || world.location_by_coords(cur_coords).has_item?('tent')
+      if self.inventory.contains_item?('tent') || world.location_by_coords(cur_coords).has_item?('tent')
         self.hp_cur = self.hp_max
 
         return "You brandish your trusty magical canvas, and with a flick of the wrist your home for the evening is set up. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up, fully rested, ready for adventure."

data/lib/gemwarrior/inventory.rb

@@ -29,12 +29,12 @@ module Gemwarrior
       end
     end
 
-    def has_item?(item_name)
+    def contains_item?(item_name)
       items.map(&:name).include?(item_name)
     end
 
     def describe_item(item_name)
-      if has_item?(item_name)
+      if contains_item?(item_name)
         items.each do |i|
           if i.name.eql?(item_name)
             return i.description
@@ -46,7 +46,7 @@ module Gemwarrior
     end
 
     def equip_item(item_name)
-      if has_item?(item_name)
+      if contains_item?(item_name)
         items.each do |i|
           if i.name.eql?(item_name)
             if i.equippable
@@ -64,7 +64,7 @@ module Gemwarrior
     end
 
     def unequip_item(item_name)
-      if has_item?(item_name)
+      if contains_item?(item_name)
         items.each do |i|
           if i.name.eql?(item_name)
             if i.equippable
@@ -101,8 +101,11 @@ module Gemwarrior
     end
 
     def remove_item(item_name)
-      if has_item?(item_name)
+      if contains_item?(item_name)
         items.reject! { |item| item.name == item_name }
+
+        self.weapon = nil if self.weapon.name.eql?(item_name)
+        
         return "The #{item_name} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone."
       else
         ERROR_ITEM_REMOVE_INVALID

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Michael Chadwick