gemwarrior 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7b7b4510ab007ccec7bdfc2cae8357f3ae876d
-  data.tar.gz: 9100d13c3f00bfc5df68ca7e4bbdde8edaa85a7c
+  metadata.gz: 4e003f1c361b29e19bf92a5d6041cdf41625ffee
+  data.tar.gz: 1aa44590aa8d6d79460d64910509519482dffc03
 SHA512:
-  metadata.gz: 803ffeedec0a850cb64c7cd5425952cdc6ce85551477c4d1005ebea92cad829a4608298179965e4d462cf4de384b141156d017442a49d9344ee7e56e7a6ff68b
-  data.tar.gz: b099640251fa7d4c86aaf831d5c8b35c4a278e126ae9593d5c929ad176b7a73fb525adbd9e6ce1696e20219fc9800dcf44d713836b2513809706819edc65d48c
+  metadata.gz: 27726ab0025e81e5a9b1863f772ff2cd5d99bb468ce1609414c4c4bf97ad1e1cac906e04923cda45183680b7e737ec96490ca1ed0fe0f48671a78a2e5b37da63
+  data.tar.gz: 9f6f72ad094d442b8064ab21c3c22ef186563a88958b9ae363e3322f52ca69de6b458a88078a5c002e0c12fdb8c737a238ccb4b15c03c610698d160516fec87f

data/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

data/lib/gemwarrior/arena.rb

@@ -30,11 +30,11 @@ module Gemwarrior
         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

data/lib/gemwarrior/entities/item.rb

@@ -6,13 +6,14 @@ require_relative 'entity'
 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 @@ module Gemwarrior
       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

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

@@ -19,6 +19,7 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
+      self.talkable     = true
     end
 
     def use(player = nil)
@@ -26,17 +27,20 @@ module Gemwarrior
       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

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

@@ -19,13 +19,11 @@ module Gemwarrior
 
     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

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

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

data/lib/gemwarrior/evaluator.rb

@@ -14,10 +14,13 @@ module Gemwarrior
     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,14 +60,14 @@ module Gemwarrior
         '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',
@@ -72,6 +75,7 @@ module Gemwarrior
         '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 @@ module Gemwarrior
         '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 @@ module Gemwarrior
                   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 @@ module Gemwarrior
                   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 @@ module Gemwarrior
         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 @@ module Gemwarrior
           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 @@ module Gemwarrior
                     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 @@ module Gemwarrior
       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 @@ module Gemwarrior
     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 @@ module Gemwarrior
         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

data/lib/gemwarrior/inventory.rb

@@ -113,10 +113,11 @@ module Gemwarrior
 
     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."

data/lib/gemwarrior/repl.rb

@@ -210,7 +210,7 @@ module Gemwarrior
           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 @@ module Gemwarrior
         answer = gets.chomp.downcase
           
         case answer
-        when 'y'
+        when 'y', 'yes'
           puts 'New game started! Press any key to continue.'
           gets
           return true

data/lib/gemwarrior/version.rb

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

metadata

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