gemwarrior 0.9.10 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaefc1728156bed990a2587cb84951231135d8a
-  data.tar.gz: 5060bd8a701f90534ce639095be3cd4dfc659e66
+  metadata.gz: 30320b17fc348bcf979a232b45e942b2760a6f7d
+  data.tar.gz: 33a63526a76eeb98fae273542b3a55fbfb9b0287
 SHA512:
-  metadata.gz: 03d906c73ca04bff1be05b0931414014782e0e64847fe974627d81e5cdd5817f784f06909b89eac925dc6f91ecd3a8b0a8d7ef772573da5960ad713bb7d56f80
-  data.tar.gz: 2db84ce081bad9796998db63ae4a389015229b15de8b7853522f5fc3b6b35c5f5c4bcc3d96ad60fd620a9189290310e2ecd87ee4aa43d4ce59932f8f131d08c8
+  metadata.gz: 9c795a7c3823054838aa6e8149a37e320124736e112abb7cfc47db8aa58684addf7830e412c6efd04d167fee7719634ce75e24548786c899c20c03ea2a33fb7a
+  data.tar.gz: ee7df37798af7556b855ad3c8fb639cd19514d6d1d45ed719f26c72c35543ea89efa25132cbe79f6deb44a15a09db84e52859a5c68ac58d42b7e97b571af98d0

data/lib/gemwarrior/arena.rb

@@ -24,11 +24,12 @@ module Gemwarrior
         result = battle.start(is_arena = true)
         
         if result.eql?('death')
-          return 'exit'
+          return 'death'
         end
 
         arena_monsters_vanquished += 1
 
+        puts
         puts 'Do you wish to continue fighting in the Arena? (Y/N)'
         answer = gets.chomp.downcase
 

data/lib/gemwarrior/battle.rb

@@ -136,11 +136,11 @@ module Gemwarrior
             next
           end
         when 'run', 'r'
-          if player_escape?
+          if player_escape?(is_arena)
             monster.hp_cur = monster.hp_max
             puts "You successfully elude #{monster.name}!".colorize(:green)
             print_escape_text
-            return
+            return 'escaped'
           else
             puts "You were not able to run away! :-(".colorize(:yellow)
           end
@@ -287,22 +287,24 @@ module Gemwarrior
 
     def player_death
       puts "You are dead, slain by the #{monster.name}!".colorize(:red)
-      puts 'Your adventure ends here. Try again next time!'.colorize(:red)
       print_battle_line
     end
 
-    def player_escape?
-      if (player.dexterity > monster.dexterity)
-        return true
-      else
-        dex_diff = monster.dexterity - player.dexterity
-        rand_dex = rand(0..dex_diff)
-        if rand_dex % 2 > 0
+    def player_escape?(is_arena)
+      unless is_arena
+        if (player.dexterity > monster.dexterity)
           return true
         else
-          return false
+          dex_diff = monster.dexterity - player.dexterity
+          rand_dex = rand(0..dex_diff)
+          if rand_dex % 2 > 0
+            return true
+          else
+            return false
+          end
         end
       end
+      return false
     end
 
     # STATUS TEXT

data/lib/gemwarrior/entities/item.rb

@@ -13,7 +13,8 @@ module Gemwarrior
                   :equipped,
                   :consumable,
                   :use,
-                  :used
+                  :used,
+                  :number_of_uses
 
     def use(inventory = nil)
       'That item does not do anything...yet.'

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

@@ -29,6 +29,7 @@ module Gemwarrior
         answer = gets.chomp.downcase
         case answer
         when 'y', 'yes'
+          player.rox -= 50
           puts 'She pockets the money and motions toward the center of the arena. She reminds you that you will be facing an ever-worsening onslaught of monsters. Each one you dispatch nets you a bonus cache of rox in addition to whatever the monster gives you. You will also become more experienced the longer you last. Finally, you can give up at any time between battles.'
           puts
           puts 'She finishes by wishing you good luck!'

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

@@ -6,18 +6,19 @@ require_relative '../item'
 module Gemwarrior
   class Tent < Item
     def initialize
-      self.name         = 'tent'
-      self.description  = 'A magical, two-room suite pops up when you flick this otherwise folded piece of canvas just right, perfect for a night\'s rest.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = true
-      self.useable      = true
-      self.equippable   = false
-      self.equipped     = false
+      self.name           = 'tent'
+      self.description    = 'A magical, two-room suite pops up when you flick this otherwise folded piece of canvas just right, perfect for a night\'s rest.'
+      self.atk_lo         = nil
+      self.atk_hi         = nil
+      self.takeable       = true
+      self.useable        = true
+      self.equippable     = false
+      self.equipped       = false
+      self.number_of_uses = 5
     end
 
     def use(player = nil)
-      {:type => 'action', :data => 'rest'}
+      {:type => 'tent', :data => self.number_of_uses}
     end
   end
 end

data/lib/gemwarrior/entities/player.rb

@@ -95,7 +95,7 @@ module Gemwarrior
       self_text << "Current status - breathing, wearing clothing, and with a few other specific characteristics: face is #{self.face}, hands are #{self.hands}, and general mood is #{self.mood}.\n"
     end
 
-    def rest(world)
+    def rest(world, tent_uses = nil)
       cur_loc = world.location_by_coords(cur_coords)
 
       if cur_loc.should_spawn_monster?
@@ -120,10 +120,10 @@ module Gemwarrior
 
       Animation::run({:phrase => '** Zzzzz **'})
 
-      if self.inventory.contains_item?('tent') || world.location_by_coords(cur_coords).has_item?('tent')
+      if tent_uses > 0
         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."
+        return "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."
       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
@@ -196,7 +196,7 @@ module Gemwarrior
       battle = Battle.new({:world => world, :player => self, :monster => monster})
       result = battle.start
       if result.eql?('death')
-        return 'exit'
+        return 'death'
       end
     end
 
@@ -281,8 +281,8 @@ module Gemwarrior
 
     def player_death
       puts 'Your actions have reduced you to death.'.colorize(:red)
-      puts 'Your adventure ends here. Try again next time!'.colorize(:red)
-      return 'exit'
+      puts 'Somehow, however, your adventure does not end here. Instead, you are whisked back home via some magical force, a bit worse for the weary and somewhat poorer, but ALIVE!'.colorize(:yellow)
+      return 'death'
     end
 
     # TRAVEL

data/lib/gemwarrior/evaluator.rb

@@ -261,7 +261,36 @@ module Gemwarrior
           world.player.list_inventory
         end
       when 'rest', 'r'
-        world.player.rest(world)
+        tent_uses = 0
+        player_inventory = world.player.inventory.items
+        location_inventory = world.location_by_coords(world.player.cur_coords).items
+        
+        if player_inventory.map(&:name).include?('tent')
+          player_inventory.each do |i|
+            if i.name.eql?('tent')
+              if i.number_of_uses > 0
+                result = i.use(world.player)
+                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)."
+              end
+            end
+          end
+        elsif location_inventory.map(&:name).include?('tent')
+          location_inventory.each do |i|
+            if i.name.eql?('tent')
+              if i.number_of_uses > 0
+                result = i.use(world.player)
+                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)."
+              end
+            end
+          end
+        end
+        world.player.rest(world, tent_uses)
       when 'look', 'l'
         if param1
           world.describe_entity(world.location_by_coords(world.player.cur_coords), param1)
@@ -283,13 +312,21 @@ module Gemwarrior
 
           player_inventory = world.player.inventory.items
           location_inventory = world.location_by_coords(world.player.cur_coords).items
-          
+
           if player_inventory.map(&:name).include?(item_name)
             player_inventory.each do |i|
               if i.name.eql?(item_name)
                 if i.useable
-                  result = i.use(world.player)
-                  if i.consumable
+                  if !i.number_of_uses.nil?
+                    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)."
+                    else
+                      return "#{i.name} cannot be used anymore."
+                    end
+                  elsif i.consumable
+                    result = i.use(world.player)
                     world.player.inventory.remove_item(i.name)
                   end
                 else
@@ -301,9 +338,17 @@ module Gemwarrior
             location_inventory.each do |i|
               if i.name.eql?(item_name)
                 if i.useable
-                  result = i.use(world.player)
-                  if i.consumable
-                    world.location_by_coords(world.player.cur_coords).remove_item(i)
+                  if !i.number_of_uses.nil?
+                    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)."
+                    else
+                      return "#{i.name} cannot be used anymore."
+                    end
+                  elsif i.consumable
+                    result = i.use(world.player)
+                    world.player.inventory.remove_item(i.name)
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -332,6 +377,8 @@ module Gemwarrior
             when 'xp'
               world.player.update_stats({:reason => :xp, :value => result[:data]})
               return
+            when 'tent'
+              world.player.rest(world, result[:data])
             when 'action'
               case result[:data]
               when 'rest'
@@ -343,8 +390,8 @@ module Gemwarrior
               arena = Arena.new({:world => world, :player => world.player})
               result = arena.start
               
-              if result.eql?('exit')
-                return 'exit'
+              if result.eql?('death')
+                player_death_resurrection
               end
             when 'item'
               world.location_by_coords(world.player.cur_coords).add_item(result[:data])
@@ -397,7 +444,11 @@ module Gemwarrior
           monster_name = param1
           if world.has_monster_to_attack?(monster_name)
             monster = world.location_by_coords(world.player.cur_coords).monster_by_name(monster_name)
-            world.player.attack(world, monster)
+            result = world.player.attack(world, monster)
+            
+            if result.eql?('death')
+              player_death_resurrection
+            end
           else
             ERROR_ATTACK_PARAM_INVALID
           end
@@ -435,6 +486,17 @@ module Gemwarrior
 
     private
 
+    def player_death_resurrection
+      puts 'Somehow, though, your adventure does not end here. Instead, you are whisked back home via some magical force, a bit worse for the weary and somewhat poorer, but ALIVE!'.colorize(:yellow)
+      world.player.hp_cur = 1
+      world.player.rox -= (world.player.rox * 0.1).to_i
+      if world.player.rox < 0
+        world.player.rox = 0
+      end
+      world.player.cur_coords = world.location_coords_by_name('Home')
+      world.describe(world.location_by_coords(world.player.cur_coords))
+    end
+
     def print_separator
       puts "========================================================="
     end

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -2,7 +2,6 @@
 # World where the locations, monsters, items, etc. exist
 
 require 'yaml'
-require 'pry'
 
 require_relative 'entities/item'
 require_relative 'entities/location'

metadata

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