gemwarrior 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2882237d0ae680196fd53ba40b980b971cb98827
-  data.tar.gz: 8526b2c173b534c5179b6a77f7ca9f6f084240f8
+  metadata.gz: 93bc49273b5962d3094e927e1f2b604fcd4190b9
+  data.tar.gz: c7219c8675e8549d72e2df4db0e5caf860ab3b47
 SHA512:
-  metadata.gz: df7ee21d2dea13af1bbaf0c418c83cfc789782542404950b864bc3f52d8068d7590fd7a6468dd194c8b64feeb019c8ea9965b1ee4ceb497de31800c1b0042fcf
-  data.tar.gz: 750f4ee539610fd37cba7ae432458044fe1a76d1ef1dd37369a3b95f707565ffefa3b708371949c2efe5d16973b42332d941a9801c2349e37f6be096e43a569e
+  metadata.gz: 1efa9aa0504e57f90d77bcf29e1dc6677a7709ba1114016256cf280cf626f3d2e5bd6eed100c5f72eb093f8f52bb1eab16964c454f0c043ef5fb709d1271277c
+  data.tar.gz: 4d80c518aad9e8eff5fc8f0c916b38031b01b234e3fc13f87ff4eb73c45cc6af4a1cd6538013cb94e6ca82dae2ea727cc9982c80b64d5d7ad94657c1fb0ad165

data/lib/gemwarrior/arena.rb

@@ -56,7 +56,7 @@ module Gemwarrior
       random_monster = nil
 
       loop do
-        random_monster = world.monsters[rand(0..world.monsters.length-1)]
+        random_monster = world.monsters[rand(0..world.monsters.length-1)].clone
 
         unless random_monster.is_boss
           break

data/lib/gemwarrior/entities/player.rb

@@ -95,14 +95,24 @@ 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, tent_uses = nil)
+    def rest(world, tent_uses = nil, ensure_fight = false)
+      if ensure_fight
+        battle = Battle.new({:world => world, :player => self, :monster => world.monsters[rand(0..world.monsters.length-1)].clone})
+        result = battle.start(is_arena = false, is_event = true)
+        if result.eql?('death')
+          return 'death'
+        else
+          return
+        end
+      end
+      
       cur_loc = world.location_by_coords(cur_coords)
 
       if cur_loc.should_spawn_monster?
         chance_of_ambush = rand(0..100)
 
         if chance_of_ambush < 25
-          battle = Battle.new({:world => world, :player => self, :monster => cur_loc.monsters_abounding[rand(0..cur_loc.monsters_abounding.length-1)]})
+          battle = Battle.new({:world => world, :player => self, :monster => cur_loc.monsters_abounding[rand(0..cur_loc.monsters_abounding.length-1)].clone})
           return battle.start(is_arena = false, is_event = true)
         end
       end
@@ -123,12 +133,12 @@ module Gemwarrior
       if tent_uses > 0
         self.hp_cur = self.hp_max
 
-        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."
+        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."
       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
 
-        return "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}."
+        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}."
       end
     end
 
@@ -241,7 +251,7 @@ module Gemwarrior
           self.inventory.items.concat monster_items unless monster_items.empty?
         end
       when trigger[:reason].eql?(:xp)
-        self.xp += trigger[:value].xp
+        self.xp += trigger[:value]
       when trigger[:reason].eql?(:level_bump)
         next_player_level = old_player_level + 1
         self.xp = PlayerLevels::get_level_stats(next_player_level)[:xp_start]

data/lib/gemwarrior/evaluator.rb

@@ -47,8 +47,8 @@ module Gemwarrior
     def initialize(world)
       self.world = world
 
-      self.devcommands = %w(god beast list vars map stat teleport spawn levelbump)
-      self.devaliases = %w(gd bs ls v m s tp sp lb)
+      self.devcommands = %w(god beast list vars map stat teleport spawn levelbump restfight)
+      self.devaliases = %w(gd bs ls v m s tp sp lb rf)
       self.devextras = %w(st)
       self.devcmd_descriptions = [
         'Toggle god mode (i.e. invincible)',
@@ -59,7 +59,8 @@ module Gemwarrior
         'Change player stat',
         'Teleport to coordinates (5 0 0) or location name (\'Home\')',
         'Spawn random monster',
-        'Bump your character to the next experience level'
+        'Bump your character to the next experience level',
+        'Rest, but ensure battle for testing'
       ]
 
       self.commands = %w(character inventory rest look take use drop equip unequip go attack change help quit quit!)
@@ -247,6 +248,12 @@ module Gemwarrior
           end
         when 'levelbump', 'lb'
           world.player.update_stats({:reason => :level_bump, :value => 1})
+        when 'restfight', 'rf'
+          result = world.player.rest(world, nil, true)
+          
+          if result.eql?('death')
+            player_death_resurrection
+          end
         end
       end
 
@@ -290,7 +297,12 @@ module Gemwarrior
             end
           end
         end
-        world.player.rest(world, tent_uses)
+        
+        result = world.player.rest(world, tent_uses)
+        
+        if result.eql?('death')
+          player_death_resurrection
+        end
       when 'look', 'l'
         if param1
           world.describe_entity(world.location_by_coords(world.player.cur_coords), param1)
@@ -328,6 +340,8 @@ module Gemwarrior
                   elsif i.consumable
                     result = i.use(world.player)
                     world.player.inventory.remove_item(i.name)
+                  else
+                    result = i.use(world.player)
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -349,6 +363,8 @@ module Gemwarrior
                   elsif i.consumable
                     result = i.use(world.player)
                     world.player.inventory.remove_item(i.name)
+                  else
+                    result = i.use(world.player)
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE

data/lib/gemwarrior/inventory.rb

@@ -8,10 +8,9 @@ module Gemwarrior
     ERROR_ITEM_REMOVE_INVALID     = 'Your inventory does not contain that item, so you cannot drop it.'
     ERROR_ITEM_ADD_UNTAKEABLE     = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
     ERROR_ITEM_ADD_INVALID        = 'That item does not exist here.'
-    ERROR_ITEM_DESCRIBE_INVALID   = 'You do not possess that.'
-    ERROR_ITEM_EQUIP_INVALID      = 'You do not have anything called that to equip.'
+    ERROR_ITEM_EQUIP_INVALID      = 'You do not possess anything called that to equip.'
     ERROR_ITEM_EQUIP_NONWEAPON    = 'That cannot be equipped as a weapon.'
-    ERROR_ITEM_UNEQUIP_INVALID    = 'You do not have anything called that to unequip.'
+    ERROR_ITEM_UNEQUIP_INVALID    = 'You do not possess anything called that to unequip.'
     ERROR_ITEM_UNEQUIP_NONWEAPON  = 'That cannot be unequipped.'
 
     attr_accessor :items, :weapon
@@ -41,7 +40,7 @@ module Gemwarrior
           end
         end
       else
-        ERROR_ITEM_DESCRIBE_INVALID
+        return false
       end
     end
 
@@ -54,7 +53,7 @@ module Gemwarrior
               self.weapon = i
               return "The #{i.name} has taken charge, and been equipped."
             else
-              ERROR_ITEM_EQUIP_NONWEAPON
+              return ERROR_ITEM_EQUIP_NONWEAPON
             end
           end
         end
@@ -102,13 +101,19 @@ module Gemwarrior
 
     def remove_item(item_name)
       if contains_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
+        puts "Are you sure you want to permanently throw away #{item_name}? (Y/N)"
+        answer = gets.downcase.chomp!
         
-        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."
+        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
+        
+          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
+          return "You decide to keep #{item_name} for now."
+        end
       else
         ERROR_ITEM_REMOVE_INVALID
       end

data/lib/gemwarrior/repl.rb

@@ -17,7 +17,8 @@ module Gemwarrior
     ## MESSAGES
     QUIT_MESSAGE            = 'Temporal flux detected. Shutting down...'.colorize(:red)
     MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:yellow)
-    SPLASH_MESSAGE          = 'Welcome to the land of *Jool*, where randomized fortune is just as likely as mayhem.'
+    SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
+    WRAP_WIDTH              = 80
 
     attr_accessor :world, :eval
 
@@ -91,6 +92,7 @@ module Gemwarrior
       noun3_values = WordList.new(world.use_wordnik, 'noun-plural')
 
       puts "* Remember: #{noun1_values.get_random_value} and #{noun2_values.get_random_value} are the key to #{noun3_values.get_random_value} *\n\n"
+      puts
     end
 
     def print_help
@@ -174,14 +176,19 @@ module Gemwarrior
       print_logo
 
       # main menu loop until new game or exit
-      run_main_menu unless world.new_game
+      if world.new_game
+        print_splash_message
+        print_fortune
+      else
+        run_main_menu
+      end
 
       # hook to do something right off the bat
       puts eval.evaluate(initialCommand) unless initialCommand.nil?
     end
 
     def prompt
-      prompt_template = "\n[LV:%3s][XP:%3s][ROX:%3s] -- [HP:%3s/%-3s][STM:%2s/%-2s] -- [%s @ %s]"
+      prompt_template = "\n[LV:%2s][XP:%3s][ROX:%3s] [HP:%3s/%-3s][STM:%2s/%-2s] [%s @ %s]"
       if world.debug_mode
         prompt_template += "[%s, %s, %s]"
       end
@@ -199,12 +206,17 @@ module Gemwarrior
       if world.debug_mode
         prompt_vars_arr.push(world.player.cur_coords[:x], world.player.cur_coords[:y], world.player.cur_coords[:z])
       end
-      puts (prompt_template % prompt_vars_arr).colorize(:yellow)
+      print (prompt_template % prompt_vars_arr).colorize(:yellow)
+      print "\n"
     end
 
     def read_line
       prompt_text = world.debug_mode ? ' GW[D]> ' : ' GW> '
       Readline.readline(prompt_text, true).to_s
     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/version.rb

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

data/lib/gemwarrior/world.rb

@@ -170,9 +170,11 @@ module Gemwarrior
     end
 
     def describe_entity(point, entity_name)
+      entity_name.downcase!
+      
       if point.has_item?(entity_name)
         point.items.each do |i|
-          if i.name.downcase.eql?(entity_name.downcase)
+          if i.name.downcase.eql?(entity_name)
             if debug_mode
               return i.describe
             else
@@ -180,30 +182,28 @@ module Gemwarrior
             end
           end
         end
-      elsif
-        if point.has_monster?(entity_name)
-          point.monsters_abounding.each do |m|
-            if m.name.downcase.eql?(entity_name.downcase)
-              if debug_mode
-                return m.describe
-              else
-                return m.description
-              end
+      elsif point.has_monster?(entity_name)
+        point.monsters_abounding.each do |m|
+          if m.name.downcase.eql?(entity_name)
+            if debug_mode
+              return m.describe
+            else
+              return m.description
             end
           end
         end
-      elsif
-        if point.has_boss?(entity_name)
-          point.bosses_abounding.each do |b|
-            if b.name.downcase.eql?(entity_name.downcase)
-              if debug_mode
-                return b.describe
-              else
-                return b.description
-              end
+      elsif point.has_boss?(entity_name)
+        point.bosses_abounding.each do |b|
+          if b.name.downcase.eql?(entity_name)
+            if debug_mode
+              return b.describe
+            else
+              return b.description
             end
           end
         end
+      elsif player.inventory.contains_item?(entity_name)
+        player.inventory.describe_item(entity_name)
       else
         ERROR_LOCATION_DESCRIBE_ENTITY_INVALID
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -294,4 +294,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/rubywarrior_spec.rb
+- spec/spec_helper.rb