gemwarrior 0.9.30 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e9cee8573acb0083872daea6e2285fa9eafa21
-  data.tar.gz: 62ec64e460eecf46151034bbf589e5d0f9589a97
+  metadata.gz: d55fe04a8f5043e88e3190a89d1769ab83303ee0
+  data.tar.gz: 076226766021189d922d10f5775c3ddef13dd283
 SHA512:
-  metadata.gz: 18176880eaf8310d89e910ee8e0356239815b88a7dbb7a2a5b251c0cbc03e486b1502fe202cfdc9bc6c524a0305713bbbbbba741eb2f341ebc7fc71acd7638d4
-  data.tar.gz: d2acbc2cfd2fa3a4b55ff2735a40c2a4981a1013c2c8e1e498c1017d1b0e0bca984366ea5616ec24e1abb9936ccd5fc84910aae6cbf814a3fdbc063eec423b13
+  metadata.gz: 91fa430b80846bde16f61f33997cd227c80f436c4efe17ed47398477045f199c0ce47a4e9216cf02fb36fde3a74c52955790561d79a643913c1f69d13f62a4ca
+  data.tar.gz: 9d71ed1c86feed2ac58a35345bb0c074c19924e1bef42752e53a98b4ecf34cb73649f033990d85fa606f15cbcadbdf7c3e34c5c0312902beeb67a2d01c3fd529

data/data/locations.yml

@@ -1073,9 +1073,9 @@
     y: 8
     z: 1
   locs_connected:
-    north: true
+    north: false
     east:  true
-    south: false
+    south: true
     west:  false  
   monster_level_range:
     lo: 3

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

@@ -18,7 +18,8 @@ module Gemwarrior
 
     def use(player = nil)
       if player.at_full_hp?
-        puts 'You come to rest on the impossibly soft surface of the furniture, but even after a few minutes of this seemingly heavenly hedonism you don\'t feel significantly better and decide to get up again.'
+        puts 'You "sit" on the impossibly soft surface of the furniture, but even after a few minutes of this seemingly heavenly hedonism you don\'t feel significantly better and decide to get up again.'
+        { type: nil, data: nil }
       else
         puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat better after getting back up.'
         puts '>> You regain a hit point.'

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

@@ -6,9 +6,12 @@ require_relative 'herb'
 require_relative 'dagger'
 
 module Gemwarrior
-  PLAYER_ROX_INSUFFICIENT = 'You do not have enough rox to purchase that item.'
-
   class SmallHole < Item
+    # CONSTANTS
+    PLAYER_ROX_INSUFFICIENT = '>> "Pity. You are a bit short on funds to purchase that item."'
+    PLAYER_ITEMS_ADDITIONAL = '>> "Anything else?"'
+    PLAYER_COMMAND_INVALID  = '>> "Huh?"'
+
     def initialize
       self.name         = 'small_hole'
       self.description  = 'Amongst the rubble of the alcove, a small hole, barely big enough for a rodent, exists in an absently-minded way near the bottom of the wall.'
@@ -33,7 +36,7 @@ module Gemwarrior
     def rat_shop(player)
       items_purchased = []
     
-      puts '>>"Hello, wanderer. Welcome to my establishment, as it were. Are you in need of anything?"'
+      puts '>> "Hello, wanderer. Welcome to my establishment, as it were. Are you in need of anything?"'
       puts
       puts 'The creature gently shoves a small slip of paper out of his hole and towards you. You take a peek and notice it has a list of things with prices on it.'
       puts
@@ -42,7 +45,7 @@ module Gemwarrior
       puts '(1) Herb     - 10  rox'
       puts '(2) Dagger   - 150 rox'
       puts
-      puts '>>"What are you in need of?"'
+      puts '>> "What are you in need of?"'
 
       loop do
         puts ' 1 - Herb'
@@ -56,8 +59,8 @@ module Gemwarrior
           if player.rox >= 10
             player.rox -= 10
             items_purchased.push(Herb.new)
-            puts '>>"Excellent choice."'
-            puts '>>"Anything else?"'
+            puts '>> "Excellent choice."'
+            puts PLAYER_ITEMS_ADDITIONAL
             next
           else
             puts PLAYER_ROX_INSUFFICIENT
@@ -67,18 +70,18 @@ module Gemwarrior
           if player.rox >= 150
             player.rox -= 150
             items_purchased.push(Dagger.new)
-            puts '>>"A fine blade, indeed."'
-            puts '>>"Anything else?"'
+            puts '>> "A fine blade, indeed."'
+            puts PLAYER_ITEMS_ADDITIONAL
             next
           else
             puts PLAYER_ROX_INSUFFICIENT
             next
           end
         when 'x'
-          puts '>>"If you need anything further, I\'m always in this hole..."'
+          puts '>> "If you need anything further, I\'m always in this hole..."'
           return { type: 'purchase', data: items_purchased }
         else
-          puts '>>"Huh?"'
+          puts PLAYER_COMMAND_INVALID
           next
         end
       end

data/lib/gemwarrior/entities/player.rb

@@ -141,22 +141,29 @@ module Gemwarrior
 
       if tent_uses > 0
         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.'
+          return '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: REST_NOT_FULL_TEXT)
-          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
+
+          status_text = "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."
+          status_text << "\n>> You regain all of your hit points."
+
+          return status_text
         end
       else
         if self.at_full_hp?
           Animation::run(phrase: REST_FULL_TEXT)
-          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.'
+          return '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: REST_NOT_FULL_TEXT)
-          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
+
+          status_text = "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}."
+          status_text << "\n>> You regain a few hit points."
+
+          return status_text
         end
       end
     end

data/lib/gemwarrior/evaluator.rb

@@ -287,7 +287,7 @@ module Gemwarrior
                 tent_uses = i.number_of_uses
                 i.number_of_uses -= 1
 
-                puts "The tent can be used when resting #{i.number_of_uses} more time(s)."
+                puts ">> tent can be used when resting #{i.number_of_uses} more time(s)."
               end
             end
           end
@@ -299,7 +299,7 @@ module Gemwarrior
                 tent_uses = i.number_of_uses
                 i.number_of_uses -= 1
 
-                puts "The tent can be used when resting #{i.number_of_uses} more time(s)."
+                puts ">> tent can be used when resting #{i.number_of_uses} more time(s)."
               end
             end
           end
@@ -309,6 +309,8 @@ module Gemwarrior
 
         if result.eql?('death')
           player_death_resurrection
+        else
+          result
         end
       when 'look', 'l'
         if param1
@@ -347,9 +349,9 @@ module Gemwarrior
                     if i.number_of_uses > 0
                       result = i.use(world.player)
                       i.number_of_uses -= 1
-                      puts "#{i.name} can be used #{i.number_of_uses} more time(s)."
+                      puts ">> #{i.name} can be used #{i.number_of_uses} more time(s)."
                     else
-                      return "#{i.name} cannot be used anymore."
+                      return ">> #{i.name} cannot be used anymore."
                     end
                   elsif i.consumable
                     result = i.use(world.player)
@@ -370,9 +372,9 @@ module Gemwarrior
                     if i.number_of_uses > 0
                       result = i.use(world.player)
                       i.number_of_uses -= 1
-                      puts "#{i.name} can be used #{i.number_of_uses} more time(s)."
+                      puts ">> #{i.name} can be used #{i.number_of_uses} more time(s)."
                     else
-                      return "#{i.name} cannot be used anymore."
+                      return ">> #{i.name} cannot be used anymore."
                     end
                   elsif i.consumable
                     result = i.use(world.player)
@@ -430,6 +432,7 @@ module Gemwarrior
               result[:data].each do |i|
                 world.player.inventory.items.push(i)
               end
+              return
             else
               return
             end

data/lib/gemwarrior/version.rb

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

metadata

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