gemwarrior 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: babc9fa938add431037f3358093781acb3ed0a5b
-  data.tar.gz: cc90ad3fb0b5eef65f5f4e2ea50c907fe896d895
+  metadata.gz: ff8474b226f235786ac195ba7caf4fbeef9cbb1c
+  data.tar.gz: 343641b13eaac3315e3c489a1d9329f27f64eded
 SHA512:
-  metadata.gz: 8719c4ea0561368a4d2b18e9245c1d96e5e4657f74cf56213018157197d59b38e912a432c3fe12730113edad3d19214061875546bdad3adb90e283ed194ecccf
-  data.tar.gz: 263340f58185a801a95eff588bacdf131f77ad3231b0083b66db805ec598e14e60957225752ff0e3303036334c8fa614388bc3f57dd4a77a38a203f747d5146d
+  metadata.gz: 90ea27cc4e68f7cb58cba9a972f62039c86328c99101a17373e682a165d1f5dbab56cf578637fc141d2412310c1a1e036559c76ef24f18ea2b7883f4b2234e63
+  data.tar.gz: c88db1ad5118a232e10b08515700d04e1c10c456493fb2a2da7de2fc7b871837b8e8727d3fd97953d071df9574828bb0d72da33f49c9889338c8ee25b4f6389d

data/data/default_world.yaml

@@ -1090,7 +1090,19 @@ locations:
     begin: 5
     end: 20
     excl: false
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::SandJewel
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: false
+    name: sand_jewel
+    name_display: Sand Jewel
+    description: As blue (or is it violet? or brown?) as it is brittle, this shiny rock feels warm to the touch.
+    takeable: true
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding:
   - !ruby/object:Gemwarrior::Garynetty
@@ -1274,7 +1286,7 @@ locations:
 - !ruby/object:Gemwarrior::Location
   name: plains-south_southeast
   name_display: Plains (South-Southeast)
-  description: The river continues to flow north of you, as plains stretch out all
+  description: A path north of you descends into a valley, but otherwise the plains stretch out all
     around. The noise from the east is quite loud, and a building can be seen in the
     near distance.
   coords:
@@ -1282,7 +1294,7 @@ locations:
     :y: 3
     :z: 0
   locs_connected:
-    :north: false
+    :north: true
     :east: true
     :south: false
     :west: true
@@ -1472,15 +1484,14 @@ locations:
   name: plains-north_of_bridge
   name_display: Plains (North of Bridge)
   description: North of the river feels similar to south of the river, as you continue
-    to be surrounded by grass and grass and, well, grass. A path to the east stretches
-    out into a valley.
+    to be surrounded by grass and grass and, well, grass.
   coords:
     :x: 4
     :y: 5
     :z: 0
   locs_connected:
     :north: false
-    :east: true
+    :east: false
     :south: true
     :west: true
   danger_level: :low
@@ -1493,19 +1504,19 @@ locations:
   bosses_abounding: []
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
-  name: peridover_valley-outskirts_west
-  name_display: Peridover Valley (Outskirts (West))
+  name: peridover_valley-south
+  name_display: Peridover Valley (South)
   description: The road slopes down slightly here, but in the near distance you can
-    see that it slopes way more slopily.
+    see that it slopes way more slopily. A mighty river ends in a bay to your west.
   coords:
-    :x: 5
-    :y: 5
+    :x: 6
+    :y: 4
     :z: 0
   locs_connected:
-    :north: false
-    :east: true
-    :south: false
-    :west: true
+    :north: true
+    :east: false
+    :south: true
+    :west: false
   danger_level: :low
   monster_level_range: !ruby/range
     begin: 2
@@ -1527,8 +1538,8 @@ locations:
   locs_connected:
     :north: false
     :east: true
-    :south: false
-    :west: true
+    :south: true
+    :west: false
   danger_level: :moderate
   monster_level_range: !ruby/range
     begin: 3
@@ -1539,8 +1550,8 @@ locations:
   bosses_abounding: []
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
-  name: peridover_valley-outskirts_east
-  name_display: Peridover Valley (Outskirts (East))
+  name: peridover_valley-northeast
+  name_display: Peridover Valley (Northeast)
   description: Sloping way down to the west, but leveling off here, a din of civilization
     calls from the north.
   coords:
@@ -1749,7 +1760,7 @@ locations:
     number_of_uses: 
     talkable: true
     name: shifty_woman
-    name: Shifty Woman
+    name_display: Shifty Woman
     description: Sharply dressed with impeccable style, you still can't shake the feeling that this 
       otherwise ordinary woman is up to something. It might be the way she almost impulsively looks 
       back and forth along the town street while rubbing her hands together menacingly.
@@ -2104,11 +2115,11 @@ locations:
     hands: tantalizing
     mood: enraged
     level: 15
-    hp_cur: 32
-    hp_max: 32
+    hp_cur: 100
+    hp_max: 100
     atk_lo: 28
     atk_hi: 44
-    defense: 5
+    defense: 6
     dexterity: 9
     inventory: !ruby/object:Gemwarrior::Inventory
       armor: 
@@ -2131,6 +2142,8 @@ locations:
       ha ha ha! Prepare yourself fool: today your whole life crumbles!'
     is_boss: true
     is_dead: false
+    talkable: true
+    useable: true
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
   name: sky_tower-lounge
@@ -2299,4 +2312,6 @@ player: !ruby/object:Gemwarrior::Player
   rests_taken: 0
   deaths: 0
 emerald_beaten: false
+shifty_jeweled: false
+shifty_to_jewel: false
 duration:

data/lib/gemwarrior/battle.rb

@@ -10,7 +10,10 @@ module Gemwarrior
     BEAST_MODE_ATTACK           = 100
     ESCAPE_TEXT                 = '** POOF **'
 
-    attr_accessor :world, :player, :monster, :player_is_defending
+    attr_accessor :world,
+                  :player,
+                  :monster,
+                  :player_is_defending
 
     def initialize(options)
       self.world                = options.fetch(:world)
@@ -19,12 +22,13 @@ module Gemwarrior
       self.player_is_defending  = false
     end
 
-    def start(is_arena = nil, is_event = nil)
+    def start(is_arena = false, is_event = false)
       Audio.play_synth(:battle_start)
 
       # begin battle!
       print_battle_header unless is_arena
 
+      # print opponent announcement, depending on reason for battle
       if is_arena
         print '  Your opponent is now...'
         Animation.run(phrase: "#{monster.name.upcase}", speed: :slow, oneline: true)
@@ -37,12 +41,21 @@ module Gemwarrior
 
       puts "  #{monster.name} cries out: \"#{monster.battlecry}\""
 
-      # first strike!
-      unless is_arena
-        if monster_strikes_first?(is_event)
-          puts "  #{monster.name} strikes first!".colorize(:yellow)
-          monster_attacks_player
+      # first strike! (unless arena or emerald)
+      # shifty woman time, if emerald
+      if monster.name.eql?('emerald')
+        if world.shifty_to_jewel && !world.shifty_has_jeweled
+          puts
+          puts '  Suddenly, the Shifty Woman appears out of nowhere, and stands between you and Emerald!'
+          STDIN.getc
+          Person.new.speak('Hey! The developer hasn\'t figured out what I\'m here to do, but I really hope you can defeat Emerald! Also, thanks for the shiny jewel!')
+          STDIN.getc
+          puts '  The Shifty Woman\'s perplexing speech now over, she disappears.'
+          world.shifty_has_jeweled = true
         end
+      elsif monster_strikes_first?(arena_battle: is_arena, event_battle: is_event)
+        puts "  #{monster.name} strikes first!".colorize(:yellow)
+        monster_attacks_player
       end
 
       # main battle loop
@@ -259,8 +272,8 @@ module Gemwarrior
     end
 
     # MONSTER
-    def monster_strikes_first?(is_event = nil)
-      if (monster.dexterity > player.dexterity) || is_event
+    def monster_strikes_first?(arena_battle = false, event_battle = false)
+      if (monster.dexterity > player.dexterity) || event_battle || !arena_battle
         return true
       else
         dex_diff = player.dexterity - monster.dexterity

data/lib/gemwarrior/entities/creature.rb

@@ -45,7 +45,7 @@ module Gemwarrior
       self.used       = false
     end
 
-    def use
+    def use(world)
       'That creature does not seem to want to talk to you right now.'
     end
 

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

@@ -0,0 +1,21 @@
+# lib/gemwarrior/entities/items/sand_jewel.rb
+# Entity::Item::SandJewel
+
+require_relative '../item'
+
+module Gemwarrior
+  class SandJewel < Item
+    def initialize
+      super
+
+      self.name         = 'sand_jewel'
+      self.name_display = 'Sand Jewel'
+      self.description  = 'As blue (or is it violet? or brown?) as it is brittle, this shiny rock feels warm to the touch.'
+    end
+
+    def use(world)
+      puts 'You lift the sand jewel to the sky; rays of sunlight refract through it and nearly blind you.'
+      { type: nil, data: nil }
+    end
+  end
+end

data/lib/gemwarrior/entities/monster.rb

@@ -9,14 +9,16 @@ module Gemwarrior
   class Monster < Creature
     ITEM_POOL = [Herb.new, Bullet.new]
 
-    attr_accessor :battlecry, 
-                  :is_boss, 
+    attr_accessor :battlecry,
+                  :is_boss,
                   :is_dead
 
     def initialize
       super
 
       self.inventory  = Inventory.new
+      self.useable    = true
+      self.talkable   = true
       self.is_dead    = false
       3.times do
         if [true, false].sample
@@ -43,6 +45,8 @@ module Gemwarrior
       desc_text << "DEX  : #{dexterity}\n".colorize(:white)
       desc_text << "ROX  : #{rox}\n".colorize(:white)
       desc_text << "INV  : #{inventory.list_contents}\n".colorize(:white)
+      desc_text << "TALK?  #{talkable}\n".colorize(:white)
+      desc_text << "USE?   #{useable}\n".colorize(:white)
       desc_text
     end
   end

data/lib/gemwarrior/entities/monsters/bosses/emerald.rb

@@ -21,7 +21,7 @@ module Gemwarrior
       self.mood           = 'enraged'
 
       self.level          = 15
-      self.hp_cur         = rand((level * 3)..(level * 4))
+      self.hp_cur         = rand((level * 6)..(level * 7))
       self.hp_max         = hp_cur
       self.atk_lo         = rand(level..(level * 2.5).floor)
       self.atk_hi         = rand((level * 2.5).floor..(level * 3).floor)
@@ -32,6 +32,8 @@ module Gemwarrior
       self.rox            = rand((level * 9)..(level * 11))
       self.xp             = rand((level * 13)..(level * 15))
 
+      self.talkable       = true
+      self.useable        = true
       self.is_boss        = true
     end
     

data/lib/gemwarrior/entities/people/shifty_woman.rb

@@ -5,6 +5,9 @@ require_relative '../person'
 
 module Gemwarrior
   class ShiftyWoman < Person
+    # CONSTANTS
+    SHOO_TEXT = '** BAMF **'
+  
     def initialize
       super
 
@@ -16,11 +19,47 @@ module Gemwarrior
     def use(world)
       if self.used
         puts 'Attempting a friendly overture again, the woman turns and looks directly at you. Her brown eyes glint in the sun, almost turning an ochre hue. Her look burns you to the core, causing you to physically recoil a little.'
-        puts
-        puts 'You step back a few paces and quickly look elsewhere.'
+        STDIN.getc
+        puts 'She then growls in a low voice at you:'
+        speak('Have you heard of Emerald, the good-for-nothing wizard that doomed our little world of Jool by absconding with the SparklyThing(tm)?')
+        STDIN.getc
+        puts 'Before you can even begin to answer she throws up her hands and continues, stealing a look off to the side:'
+        speak('My life was fine before that idiot decided he needed MORE power than he already has.')
+        STDIN.getc
+        puts 'She crosses her arms and looks down, seemingly in thought. One of her hands rolls around, a small flicker of light dancing around it as it moves.'
+        STDIN.getc
+        speak("If only I had some #{"tanzanite".colorize(:blue)}...I could cook up a spell that would take down ol' Em faster than he could lift a wand!")
+        STDIN.getc
+        if world.player.inventory.contains_item?('sand_jewel')
+          puts 'Her head tilts upward, ever so slightly, and she looks at you, one eyebrow cocked:'
+          speak('I can sense you might have what I need. I know you want to get rid of Emerald and take back the SparklyThing(tm) to give to our beloved queen, too.')
+          STDIN.getc
+          speak('I can help. Just give me that little piece of shiny you somehow came across in your travels, and I\'ll do everything in my power to make our shared goal a reality.')
+          print 'Give the shifty woman your Sand Jewel? (y/n) '
+          answer = gets.chomp.downcase
+
+          case answer
+          when 'y', 'yes'
+            world.player.inventory.remove_item('sand_jewel')
+            world.shifty_to_jewel = true
+            speak('Yes...this will do nicely.')
+            STDIN.getc
+            speak('Forgive me, but I must take my leave for now. When the time is right, I will return!')
+            puts 'And with that, she disappears. No puff of smoke or magical to-do...she is just no more.'
+          else
+            speak('Bah! Begone, fool!')
+
+            Animation.run(phrase: SHOO_TEXT)
+            puts
+
+            puts "An aura of electric light surrounds her as you are physically pushed back a foot or so. You feel instantly, uh, #{WordList.new('adjective').get_random_value}."
+          end
+        else
+          puts 'She grumbles to herself a little before giving you a little "shoo" and recommences looking shifty.'
+        end
       else
         puts 'The woman averts her eyes from you as you commence with a greeting, giving a little scowl while she is at it.'
-        
+
         self.used = true
       end
 

data/lib/gemwarrior/evaluator.rb

@@ -8,42 +8,43 @@ require_relative 'game_options'
 module Gemwarrior
   class Evaluator
     # CONSTANTS
-    PROGRAM_NAME                        = 'Gem Warrior'
-    QUIT_MESSAGE                        = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
-    RESUME_MESSAGE                      = 'Back to adventuring!'.colorize(:green)
-
-    GO_PARAMS                           = 'Options: north, east, south, west'
-    CHANGE_PARAMS                       = 'Options: name'
-    DEBUG_LIST_PARAMS                   = 'Options: players, creatures, items, locations, monsters, weapons'
-    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.'
-    ERROR_ATTACK_PARAM_MISSING          = 'You cannot just "attack". You gotta choose something to attack.'
-    ERROR_ATTACK_PARAM_INVALID          = 'That monster does not exist here or can\'t be attacked.'
-    ERROR_TAKE_PARAM_MISSING            = 'You cannot just "take". You gotta choose something to take.'
-    ERROR_USE_PARAM_MISSING             = 'You cannot just "use". You gotta choose something to use.'
-    ERROR_USE_PARAM_INVALID             = 'You cannot use that, as it does not exist here or in your inventory.'
-    ERROR_USE_PARAM_UNUSEABLE           = 'That object is not useable.'
-    ERROR_DROP_PARAM_MISSING            = 'You cannot just "drop". You gotta choose something to drop.'
-    ERROR_EQUIP_PARAM_MISSING           = 'You cannot just "equip". You gotta choose something to equip.'
-    ERROR_UNEQUIP_PARAM_MISSING         = 'You cannot just "unequip". You gotta choose something to unequip.'
-    ERROR_CHANGE_PARAM_MISSING          = 'You cannot just "change". You gotta choose something to change.'
-    ERROR_CHANGE_PARAM_INVALID          = 'You cannot change that...yet.'
-    ERROR_LIST_PARAM_MISSING            = 'You cannot just "list". You gotta choose something to list.'
-    ERROR_LIST_PARAM_INVALID            = 'You cannot list that...yet.'
-    ERROR_DEBUG_STAT_PARAM_MISSING      = 'You cannot just "change stats". You gotta choose a stat to change.'
-    ERROR_DEBUG_STAT_PARAM_INVALID      = 'You cannot change that stat...yet.'
-    ERROR_DEBUG_STAT_INV_PARAM_INVALID  = 'You cannot add that to your inventory...yet.'
-    ERROR_DEBUG_TELEPORT_PARAMS_MISSING = 'You cannot just "teleport". You gotta specify an x AND y coordinate, at least.'
-    ERROR_DEBUG_TELEPORT_PARAMS_NEEDED  = 'You cannot just "teleport" to an x coordinate without a y coordinate.'
-    ERROR_DEBUG_TELEPORT_PARAMS_INVALID = 'You cannot teleport there...yet.'
+    PROGRAM_NAME                          = 'Gem Warrior'
+    QUIT_MESSAGE                          = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
+    RESUME_MESSAGE                        = 'Back to adventuring!'.colorize(:green)
+
+    GO_PARAMS                             = 'Options: north, east, south, west'
+    CHANGE_PARAMS                         = 'Options: name'
+    DEBUG_LIST_PARAMS                     = 'Options: players, creatures, items, locations, monsters, weapons'
+    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.'
+    ERROR_ATTACK_PARAM_MISSING            = 'You cannot just "attack". You gotta choose something to attack.'
+    ERROR_ATTACK_PARAM_INVALID            = 'That monster does not exist here or can\'t be attacked.'
+    ERROR_TAKE_PARAM_MISSING              = 'You cannot just "take". You gotta choose something to take.'
+    ERROR_USE_PARAM_MISSING               = 'You cannot just "use". You gotta choose something to use.'
+    ERROR_USE_PARAM_INVALID               = 'You cannot use that, as it does not exist here or in your inventory.'
+    ERROR_USE_PARAM_UNUSEABLE             = 'That object is not useable.'
+    ERROR_DROP_PARAM_MISSING              = 'You cannot just "drop". You gotta choose something to drop.'
+    ERROR_EQUIP_PARAM_MISSING             = 'You cannot just "equip". You gotta choose something to equip.'
+    ERROR_UNEQUIP_PARAM_MISSING           = 'You cannot just "unequip". You gotta choose something to unequip.'
+    ERROR_CHANGE_PARAM_MISSING            = 'You cannot just "change". You gotta choose something to change.'
+    ERROR_CHANGE_PARAM_INVALID            = 'You cannot change that...yet.'
+    ERROR_LIST_PARAM_MISSING              = 'You cannot just "list". You gotta choose something to list.'
+    ERROR_LIST_PARAM_INVALID              = 'You cannot list that...yet.'
+    ERROR_DEBUG_STAT_PARAM_MISSING        = 'You cannot just "change stats". You gotta choose a stat to change.'
+    ERROR_DEBUG_STAT_PARAM_INVALID        = 'You cannot change that stat...yet.'
+    ERROR_DEBUG_STAT_INV_PARAM_INVALID    = 'You cannot add that to your inventory...yet.'
+    ERROR_DEBUG_GLOBAL_VAR_INVALID        = 'That global variable does not exist.'
+    ERROR_DEBUG_TELEPORT_PARAMS_MISSING   = 'You cannot just "teleport". You gotta specify an x AND y coordinate, at least.'
+    ERROR_DEBUG_TELEPORT_PARAMS_NEEDED    = 'You cannot just "teleport" to an x coordinate without a y coordinate.'
+    ERROR_DEBUG_TELEPORT_PARAMS_INVALID   = 'You cannot teleport there...yet.'
 
     attr_accessor :world,
                   :commands,
@@ -58,16 +59,18 @@ module Gemwarrior
     def initialize(world)
       self.world = world
 
-      self.devcommands  = %w(god beast list vars map stat teleport spawn levelbump restfight)
-      self.devaliases   = %w(gd bs ls vs m st tp sp lb rf)
+      self.devcommands  = %w(god beast constants list vars map stat global teleport spawn levelbump restfight)
+      self.devaliases   = %w(gd bs cn ls vs m st gl tp sp lb rf)
       self.devextras    = %w()
       self.devcmd_descriptions = [
         'Toggle god mode (i.e. invincible)',
         'Toggle beast mode (i.e. super strength)',
+        'List all GameAssets',
         'List all instances of a specific entity type',
         'List all the variables in the world',
         'Show a map of the world',
         'Change player stat',
+        'Change world global variable',
         'Teleport to coordinates (5 0 0) or name (\'Home\')',
         'Spawn random monster',
         'Bump your character to the next level',
@@ -131,6 +134,24 @@ module Gemwarrior
         when 'beast', 'bs'
           GameOptions.data['beast_mode'] = !GameOptions.data['beast_mode']
           return "Beast mode set to #{GameOptions.data['beast_mode']}"
+        when 'constants', 'cn'
+          puts 'GameCreatures'.colorize(:yellow)
+          puts GameCreatures.data
+          STDIN.getc
+          puts 'GameMonsters'.colorize(:yellow)
+          puts GameMonsters.data
+          STDIN.getc
+          puts 'GamePeople'.colorize(:yellow)
+          puts GamePeople.data
+          STDIN.getc
+          puts 'GameItems'.colorize(:yellow)
+          puts GameItems.data
+          STDIN.getc
+          puts 'GameArmor'.colorize(:yellow)
+          puts GameArmor.data
+          STDIN.getc
+          puts 'GameWeapons'.colorize(:yellow)
+          puts GameWeapons.data
         when 'vars', 'vs'
           if param1
             world.print_vars(param1)
@@ -228,7 +249,7 @@ module Gemwarrior
             when 'inventory', 'inv'
               unless param2.nil?
                 begin
-                  item_const_name = Gemwarrior.const_get(Formatting.upstyle(param2))
+                  item_const_name = Gemwarrior.const_get(Formatting.upstyle(param2, no_space: true))
                   item = item_const_name.new
                   world.player.inventory.items.push(item)
                   return "#{item.name} added to player inventory."
@@ -240,6 +261,20 @@ module Gemwarrior
               return ERROR_DEBUG_STAT_PARAM_INVALID
             end
           end
+        when 'global', 'gl'
+          if param1.nil?
+            return world.instance_variables.join(', ')
+          elsif world.instance_variable_get("@#{param1}").nil?
+            return ERROR_DEBUG_GLOBAL_VAR_INVALID
+          elsif param2.nil?
+            return world.instance_variable_get("@#{param1}").to_s
+          else
+            val = false
+            val = param2.eql?('true') ? true : val
+
+            world.instance_variable_set("@#{param1}", val)
+            return "Instance variable #{param1} has been set to #{val}."
+          end
         when 'spawn', 'sp'
           player_cur_location = world.location_by_coords(world.player.cur_coords)
           player_cur_location.populate_monsters(GameMonsters.data, spawn: true)
@@ -369,7 +404,7 @@ module Gemwarrior
         end
       when 'talk', 'tk'
         if param1.nil?
-          return ERROR_USE_PARAM_MISSING
+          return ERROR_TALK_TO_PARAM_MISSING
         elsif param1.eql?('to')
           if param2
             param1 = param2
@@ -378,25 +413,45 @@ module Gemwarrior
           end
         end
 
-        person_name = param1
+        talkable_name = param1
 
         player_inventory = world.player.inventory
 
-        if player_inventory.contains_item?(person_name)
+        if player_inventory.contains_item?(talkable_name)
           player_inventory.items.each do |person|
-            if person.name.eql?(person_name)
+            if person.name.eql?(talkable_name)
               if person.talkable
-                return self.parse("use #{person_name}")
+                return self.parse("use #{talkable_name}")
               else
                 return ERROR_TALK_PARAM_UNTALKABLE
               end
             end
           end
-        elsif player_cur_location.contains_item?(person_name)
+        elsif player_cur_location.contains_item?(talkable_name)
           player_cur_location.items.each do |person|
-            if person.name.eql?(person_name)
+            if person.name.eql?(talkable_name)
               if person.talkable
-                return self.parse("use #{person_name}")
+                return self.parse("use #{talkable_name}")
+              else
+                return ERROR_TALK_PARAM_UNTALKABLE
+              end
+            end
+          end
+        elsif player_cur_location.has_monster?(talkable_name)
+          player_cur_location.monsters_abounding.each do |monster|
+            if monster.name.eql?(talkable_name)
+              if monster.talkable
+                return self.parse("use #{talkable_name}")
+              else
+                return ERROR_TALK_PARAM_UNTALKABLE
+              end
+            end
+          end
+        elsif player_cur_location.has_boss?(talkable_name)
+          player_cur_location.bosses_abounding.each do |boss|
+            if boss.name.eql?(talkable_name)
+              if boss.talkable
+                return self.parse("use #{talkable_name}")
               else
                 return ERROR_TALK_PARAM_UNTALKABLE
               end
@@ -458,6 +513,18 @@ module Gemwarrior
                 end
               end
             end
+          elsif player_cur_location.has_monster?(item_name)
+            player_cur_location.monsters_abounding.each do |i|
+              if i.name.eql?(item_name)
+                return i.use(world)
+              end
+            end
+          elsif player_cur_location.has_boss?(item_name)
+            player_cur_location.bosses_abounding.each do |i|
+              if i.name.eql?(item_name)
+                return i.use(world)
+              end
+            end
           end
 
           if result.nil?

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -17,7 +17,14 @@ module Gemwarrior
     WORLD_DIM_WIDTH               = 10
     WORLD_DIM_HEIGHT              = 10
 
-    attr_accessor :monsters, :locations, :weapons, :player, :duration, :emerald_beaten
+    attr_accessor :monsters,
+                  :locations,
+                  :weapons,
+                  :player,
+                  :duration,
+                  :emerald_beaten,
+                  :shifty_to_jewel,
+                  :shifty_has_jeweled
 
     def describe(point)
       desc_text = "[>>> #{point.name_display.upcase} <<<]".colorize(:cyan)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Michael Chadwick
@@ -302,6 +302,7 @@ files:
 - lib/gemwarrior/entities/items/pedestal.rb
 - lib/gemwarrior/entities/items/pond.rb
 - lib/gemwarrior/entities/items/rope.rb
+- lib/gemwarrior/entities/items/sand_jewel.rb
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparkly_thing.rb
@@ -385,6 +386,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files:
-- spec/gemwarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []