talk (to) command added; made y/n prompts consistent across game; arena_master and ware_hawker made talkable

Author: michaelchadwick

data/default_world.yaml

@@ -1556,6 +1556,7 @@ locations:
     consumable: false
     used: false
     number_of_uses: 
+    talkable: true
     name: arena_master
     description: She wears simple clothing, but carries herself with an air of authority.
       You think she may be the person to talk with if you want to engage in battle.
@@ -1761,6 +1762,7 @@ locations:
     consumable: false
     used: false
     number_of_uses: 
+    talkable: true
     name: ware_hawker
     description: A literal anthropomorphic hawk has set up shop behind a crudely-made
       table. Some wares are scattered atop its surface, seemingly within anyone's

lib/gemwarrior/arena.rb

@@ -30,11 +30,11 @@ def start
         arena_monsters_vanquished += 1
 
         puts
-        puts 'Do you wish to continue fighting in the Arena? (Y/N)'
+        print 'Do you wish to continue fighting in the Arena? (y/n) '
         answer = gets.chomp.downcase
 
         case answer
-        when 'yes', 'y'
+        when 'y', 'yes'
           next
         else
           bonus_rox = arena_monsters_vanquished * 25

lib/gemwarrior/entities/item.rb

@@ -6,13 +6,14 @@
 module Gemwarrior
   class Item < Entity
     attr_accessor :atk_lo, :atk_hi, :takeable, :useable, :equippable, :equipped,
-                  :consumable, :use, :used, :number_of_uses
+                  :consumable, :use, :used, :number_of_uses, :talkable
 
     def initialize
       self.equipped       = false
       self.consumable     = false
       self.used           = false
       self.number_of_uses = nil
+      self.talkable       = false
     end
 
     def use(inventory = nil)
@@ -28,6 +29,7 @@ def describe
       status_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
       status_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
       status_text << "NUMBER OF USES? #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
+      status_text << "TALKABLE? #{talkable}\n".colorize(:white)
       status_text << "\n"
     end
   end

lib/gemwarrior/entities/items/arena_master.rb

@@ -19,24 +19,28 @@ def initialize
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
+      self.talkable     = true
     end
 
     def use(player = nil)
       puts "You approach #{ARENA_MASTER_NAME.colorize(color: :white, background: :black)}, the Arena Master, and ask to prove your mettle in the arena. She snickers to herself, but sees you have a good spirit about you."
       puts
 
       if player.rox >= 50
-        puts "She asks for the requisite payment: #{ARENA_FEE} rox. Do you pay up? (Y/N)"
+        print "She asks for the requisite payment: #{ARENA_FEE} rox. Do you pay up? (y/n) "
         answer = gets.chomp.downcase
+        
         case answer
         when 'y', 'yes'
           player.rox -= 50
+          puts
           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!'
 
           return { type: 'arena', data: nil }
         else
+          puts
           puts 'She gives you a dirty look, as you have obviously wasted her time. You are told not to mess around with her anymore, and she turns away from you.'
           return { type: nil, data: nil }
         end

lib/gemwarrior/entities/items/letter.rb

@@ -19,13 +19,11 @@ def initialize
 
     def use(player = nil)
       if self.used
-        puts 'Do you want to read the letter again? (Y/N)'
-        print '> '
+        print 'Do you want to read the letter again? (y/n) '
+        answer = gets.chomp.downcase
 
-        choice = STDIN.getch
-
-        case choice
-        when 'y'
+        case answer
+        when 'y', 'yes'
           print "\n"
           print_letter(player)
         else

lib/gemwarrior/entities/items/ware_hawker.rb

@@ -24,6 +24,7 @@ def initialize
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
+      self.talkable     = true
     end
 
     def use(player = nil)
@@ -54,7 +55,7 @@ def hawk_shop(player)
         puts ' 2 - Spear'
         puts ' x - leave'
         print '[HAWK]> '
-        choice = gets.chomp!
+        choice = gets.chomp.downcase
 
         case choice
         when '1'

lib/gemwarrior/evaluator.rb

@@ -14,10 +14,13 @@ class Evaluator
     GO_PARAMS                           = 'Options: north, east, south, west'
     CHANGE_PARAMS                       = 'Options: name'
     DEBUG_LIST_PARAMS                   = 'Options: monsters, items, locations'
-    DEBUG_STAT_PARAMS                   = 'Options: atk_lo, atk_hi, strength, dexterity'
+    DEBUG_STAT_PARAMS                   = 'Options: hp_cur, atk_lo, atk_hi, experience, rox, strength, dexterity, defense, inventory'
 
     ERROR_COMMAND_INVALID               = 'That is not something the game yet understands.'
     ERROR_LOOK_AT_PARAM_MISSING         = 'You cannot just "look at". You gotta choose something to look at.'
+    ERROR_TALK_PARAM_INVALID            = 'Are you talking to yourself? That person is not here.'
+    ERROR_TALK_PARAM_UNTALKABLE         = 'That cannnot be conversed with.'
+    ERROR_TALK_TO_PARAM_MISSING         = 'You cannot just "talk to". You gotta choose someone to talk to.'
     ERROR_GO_PARAM_MISSING              = 'Just wander aimlessly? A direction would be nice.'
     ERROR_GO_PARAM_INVALID              = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
     ERROR_DIRECTION_PARAM_INVALID       = 'You cannot go to that place.'
@@ -57,21 +60,22 @@ def initialize(world)
         'List all the variables in the world',
         'Show a map of the world',
         'Change player stat',
-        'Teleport to coordinates (5 0 0) or location name (\'Home\')',
+        'Teleport to coordinates (5 0 0) or name (\'Home\')',
         'Spawn random monster',
-        'Bump your character to the next experience level',
+        'Bump your character to the next level',
         'Rest, but ensure battle for testing'
       ]
 
-      self.commands = %w(character inventory rest look take use drop equip unequip go north east south west attack change version checkupdate help quit quit!)
-      self.aliases = %w(c i r l t u d eq ue g n e s w a ch v cu h q qq)
+      self.commands = %w(character inventory rest look take talk use drop equip unequip go north east south west attack change version checkupdate help quit quit!)
+      self.aliases = %w(c i r l t tk u d eq ue g n e s w a ch v cu h q qq)
       self.extras = %w(exit exit! x xx fight f ? ?? ???)
       self.cmd_descriptions = [
         'Display character information',
         'Look in your inventory',
         'Take a load off and regain HP',
         'Look around your current location',
         'Take item',
+        'Talk to person',
         'Use item (in inventory or environment)',
         'Drop item',
         'Equip item',
@@ -81,11 +85,11 @@ def initialize(world)
         'Go east (shortcut)',
         'Go south (shortcut)',
         'Go west (shortcut)',
-        'Attack a monster',
+        'Attack a monster (also fight)',
         'Change something',
         'Display game version',
         'Check for newer game releases',
-        'This help menu',
+        'This help menu (also ?)',
         'Quit w/ confirmation (also exit/x)',
         'Quit w/o confirmation (also exit!/xx)'
       ]
@@ -172,7 +176,7 @@ def evaluate(input)
                   end
                 end
               end
-            when 'dexterity', 'dex', 'd'
+            when 'dexterity', 'dex'
               unless param2.nil?
                 param2 = param2.to_i
                 if param2.is_a? Numeric
@@ -181,6 +185,15 @@ def evaluate(input)
                   end
                 end
               end
+            when 'defense', 'def'
+              unless param2.nil?
+                param2 = param2.to_i
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.defense = param2
+                  end
+                end
+              end
             when 'rox', 'r', '$'
               unless param2.nil?
                 param2 = param2.to_i
@@ -333,6 +346,62 @@ def evaluate(input)
         else
           world.player.inventory.add_item(world.location_by_coords(world.player.cur_coords), param1, world.player)
         end
+      when 'talk', 'tk'
+        if param1.nil?
+          return ERROR_USE_PARAM_MISSING
+        elsif param1.eql?('to')
+          if param2
+            param1 = param2
+          else
+            return ERROR_TALK_TO_PARAM_MISSING
+          end
+        end
+        
+        person_name = param1
+        result = nil
+
+        player_inventory = world.player.inventory.items
+        location = world.location_by_coords(world.player.cur_coords)
+        location_inventory = location.items
+
+        if player_inventory.map(&:name).include?(person_name)
+          player_inventory.each do |person|
+            if person.name.eql?(person_name)
+              if person.talkable
+                result = person.use(world.player)
+              else
+                return ERROR_TALK_PARAM_UNTALKABLE
+              end
+            end
+          end
+        elsif location_inventory.map(&:name).include?(person_name)
+          location_inventory.each do |person|
+            if person.name.eql?(person_name)
+              if person.talkable
+                result = person.use(world.player)
+              else
+                return ERROR_TALK_PARAM_UNTALKABLE
+              end
+            end
+          end
+        end
+
+        return ERROR_TALK_PARAM_INVALID if result.nil?
+
+        case result[:type]
+        when 'arena'
+          arena_result = Arena.new(world: world, player: world.player)
+          arena_result = arena.start
+
+          if arena_result.eql?('death')
+            player_death_resurrection
+          end
+        when 'purchase'
+          result[:data].each do |i|
+            world.player.inventory.items.push(i)
+          end
+          return
+        end
       when 'use', 'u'
         if param1.nil?
           ERROR_USE_PARAM_MISSING
@@ -341,7 +410,8 @@ def evaluate(input)
           result = nil
 
           player_inventory = world.player.inventory.items
-          location_inventory = world.location_by_coords(world.player.cur_coords).items
+          location = world.location_by_coords(world.player.cur_coords)
+          location_inventory = location.items
 
           if player_inventory.map(&:name).include?(item_name)
             player_inventory.each do |i|
@@ -380,7 +450,7 @@ def evaluate(input)
                     end
                   elsif i.consumable
                     result = i.use(world.player)
-                    world.player.inventory.remove_item(i.name)
+                    location.remove_item(i.name)
                   else
                     result = i.use(world.player)
                   end
@@ -527,7 +597,9 @@ def evaluate(input)
       when 'quit', 'exit', 'q', 'x'
         print 'You sure you want to quit? (y/n) '
         response = gets.chomp.downcase
-        if (response.eql?('y') || response.eql?('yes'))
+        
+        case answer
+        when 'y', 'yes'
           puts QUIT_MESSAGE
           return 'exit'
         else
@@ -582,8 +654,10 @@ def print_separator
     def list_commands
       i = 0
       print_separator
+      puts ' COMMAND     | ALIAS | DESCRIPTION '
+      print_separator
       commands.each do |cmd|
-        puts " #{cmd.ljust(9)}, #{aliases[i].ljust(2)} -- #{cmd_descriptions[i]}"
+        puts " #{cmd.ljust(11)} | #{aliases[i].ljust(5)} | #{cmd_descriptions[i]}"
         i += 1
       end
       print_separator
@@ -593,7 +667,7 @@ def list_commands
         print_separator
         i = 0
         devcommands.each do |cmd|
-          puts " #{cmd.ljust(9)}, #{devaliases[i].ljust(2)} -- #{devcmd_descriptions[i]}"
+          puts " #{cmd.ljust(11)} | #{devaliases[i].ljust(5)} | #{devcmd_descriptions[i]}"
           i += 1
         end
         print_separator

lib/gemwarrior/inventory.rb

@@ -113,10 +113,11 @@ def remove_item(item_name)
 
     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!
+        print "Are you sure you want to permanently throw away #{item_name}? (y/n) "
+        answer = gets.chomp.downcase
 
-        if answer.eql?('y')
+        case answer
+        when 'y', 'yes'
           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."

lib/gemwarrior/repl.rb

@@ -210,7 +210,7 @@ def display_log_of_attempts
           answer = gets.chomp.downcase
 
           case answer
-          when 'y'
+          when 'y', 'yes'
             File.truncate(GameOptions.data['log_file_path'], 0)
             puts 'Log of attempts: erased!'
           end
@@ -418,7 +418,7 @@ def overwrite_save?
         answer = gets.chomp.downcase
 
         case answer
-        when 'y'
+        when 'y', 'yes'
           puts 'New game started! Press any key to continue.'
           gets
           return true

lib/gemwarrior/version.rb

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