gemwarrior 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53393163dfd7c1df6f5b427327a787d89aacf1a3
-  data.tar.gz: a24431d39a3de934548a6e8ab96f05f306dfbeaf
+  metadata.gz: 6fa970470b56b3fca1a179770c50bad1f38a1f57
+  data.tar.gz: 96e1f509bf41a79603c9347503bf7241b32f78e0
 SHA512:
-  metadata.gz: d99e795c05edae152924acc563331b553dc0019ddde046b8bf59bc75ec4cbbf6d81c92e186a9134223e00424d4304ec820693c9197d69529a7cbff36fdafc5c6
-  data.tar.gz: cf565870e51de63d5a7d0799800c02a04bed8b65f569fb6565cc8cc7e89685da2279b6252e26ba4ce600bda92f341d0cb9124e86f889317986c6377b91673a20
+  metadata.gz: 682e6ea04e48e876382c1a6c20853dbc6aa574aa8c06129b27f9fff075507f11e062e60a4cce06a0ee896cc6d0b055572d1c8842c5dcc69abc6f85acd61c3d77
+  data.tar.gz: 6ff0815d861be3ad5fee9e1671e9906956637564ebc8ed8b7215f967ac3a68ae886e8069f4da561c87cf04920bd6729864bdf3f6f3523582241c41533a98bbb8

data/lib/gemwarrior/entities/entity.rb

@@ -3,6 +3,9 @@
 
 module Gemwarrior
   class Entity
+    # CONSTANTS
+    WRAP_WIDTH = 80
+    
     attr_accessor :name, 
                   :description
 
@@ -10,5 +13,9 @@ module Gemwarrior
       status_text =  name.ljust(26).upcase.colorize(:green)
       status_text << "#{description}\n".colorize(:white)
     end
+    
+    def puts(s='', width=WRAP_WIDTH)
+      super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
+    end
   end
 end

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

@@ -17,10 +17,15 @@ module Gemwarrior
     end
 
     def use(player = nil)
-      Animation::run({:phrase => '** ZZZZZ **'})
-      puts 'You unmake the bed, get under the covers, close your eyes, and begin to think about all the things you need to do today. You realize sleep is not one of them and quickly get back up, remake the bed, and get on about your day.'
-      puts '>> You regain a few hit points.'
-      {:type => 'rest', :data => 5}
+      if player.at_full_hp?
+        puts 'You feel perfectly healthy and decide not to actually use the bed. Besides, the trail of fire ants currently leading up to and around the furniture seem somehow uninviting.'
+        {:type => nil, :data => nil}
+      else
+        Animation::run({:phrase => '** ZZZZZ **'})
+        puts 'You unmake the bed, get under the covers, close your eyes, and begin to think about all the things you need to do today. You realize sleep is not one of them and quickly get back up, remake the bed, and get on about your day.'
+        puts '>> You regain a few hit points.'
+        {:type => 'rest', :data => 5}
+      end
     end
   end
 end

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

@@ -18,9 +18,14 @@ module Gemwarrior
     end
 
     def use(player = nil)
-      puts 'You place the herb in your mouth, testing its texture. The mysterious herb is easily chewable, and you are able to swallow it without much effort. Slight tingles travel up and down your spine.'
-      puts '>> You regain a few hit points.'
-      {:type => 'health', :data => rand(3..5)}
+      puts 'You place the entire, smallish plant in your mouth, testing its texture. The mysterious herb is easily chewable, and you are able to swallow it without much effort. Slight tingles travel up and down your spine.'
+      if player.at_full_hp?
+        puts '>> The herb has no medicinal effect, as you already feel perfectly healthy, but it was kind of tasty.'
+        {:type => nil, :data => nil}
+      else
+        puts '>> You regain a few hit points.'
+        {:type => 'health', :data => rand(3..5)}
+      end
     end
   end
 end

data/lib/gemwarrior/entities/player.rb

@@ -129,17 +129,25 @@ module Gemwarrior
       mins_text = minutes == 1 ? 'minute' : 'minutes'
       secs_text = seconds == 1 ? 'second' : 'seconds'
 
-      Animation::run({:phrase => '** Zzzzz **'})
-
       if tent_uses > 0
-        self.hp_cur = self.hp_max
-
-        puts "You brandish the 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."
+        if self.at_full_hp?
+          puts 'Despite feeling just fine, health-wise, you decide to set up camp for the ni--well, actually, after a few minutes you realize you don\'t need to sleep and pack things up again, ready to go.'
+        else
+          Animation::run({:phrase => '** Zzzzz **'})
+          puts "You brandish the 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."
+          self.hp_cur = self.hp_max
+        end
       else
-        self.hp_cur = self.hp_cur.to_i + rand(10..15)
-        self.hp_cur = self.hp_max if self.hp_cur > self.hp_max
-
-        puts "You lie down somewhere quasi-flat and after a few moments, due to extreme exhaustion, you fall into a deep, yet troubled, slumber. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up with a start. Upon getting to your feet you look around, notice you feel somewhat better, and wonder why you dreamt about #{WordList.new(world.use_wordnik, 'noun-plural').get_random_value}."
+        if self.at_full_hp?
+          Animation::run({:phrase => '** Hmmmm **'})
+          puts 'You sit down on the ground, make some notes on the back of your hand, test the air, and then return to standing, back at it all again.'
+        else
+          Animation::run({:phrase => '** Zzzzz **'})
+          puts "You lie down somewhere quasi-flat and after a few moments, due to extreme exhaustion, you fall into a deep, yet troubled, slumber. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up with a start. Upon getting to your feet you look around, notice you feel somewhat better, and wonder why you dreamt about #{WordList.new(world.use_wordnik, 'noun-plural').get_random_value}."
+        
+          self.hp_cur = self.hp_cur.to_i + rand(10..15)
+          self.hp_cur = self.hp_max if self.hp_cur > self.hp_max
+        end
       end
     end
 
@@ -202,6 +210,10 @@ module Gemwarrior
       # stats
       self.movements_made += 1
     end
+    
+    def at_full_hp?
+      self.hp_cur == self.hp_max
+    end
 
     def attack(world, monster)
       battle = Battle.new({:world => world, :player => self, :monster => monster})

data/lib/gemwarrior/evaluator.rb

@@ -433,7 +433,7 @@ module Gemwarrior
         if param1.nil?
           ERROR_DROP_PARAM_MISSING
         else
-          world.player.inventory.remove_item(param1)
+          world.player.inventory.drop_item(param1)
         end  
       when 'equip', 'e'
         if param1.nil?
@@ -520,6 +520,7 @@ module Gemwarrior
       world.player.cur_coords = world.location_coords_by_name('Home')
       world.describe(world.location_by_coords(world.player.cur_coords))
       world.player.deaths += 1
+      return
     end
 
     def print_separator

data/lib/gemwarrior/inventory.rb

@@ -100,15 +100,19 @@ module Gemwarrior
     end
 
     def remove_item(item_name)
+      items.delete_at(items.map(&:name).index(item_name) || items.length)
+      unless self.weapon.nil?
+        self.weapon = nil if self.weapon.name.eql?(item_name)
+      end
+    end
+
+    def drop_item(item_name)
       if contains_item?(item_name)
         puts "Are you sure you want to permanently throw away #{item_name}? (Y/N)"
         answer = gets.downcase.chomp!
         
         if answer.eql?('y')
-          items.delete_at(items.map(&:name).index(item_name) || items.length)
-          unless self.weapon.nil?
-            self.weapon = nil if self.weapon.name.eql?(item_name)
-          end
+          remove_item(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

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.9.18'
+  VERSION = '0.9.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os