gemwarrior 0.14.8 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355463631c092fa850eb8cb355aec722181cc0e6
-  data.tar.gz: 9a9b11452f91d22161501042856539e54401a71e
+  metadata.gz: 42b11f28fb910a20ab8c22ad7c97f67403c0ea9b
+  data.tar.gz: 884e88c0ee09cd7c34cd75b675c09d301750642a
 SHA512:
-  metadata.gz: 69e8b6df32dd804eaf914cb564ff241dc07fa0a5106891f5c12678f95fac190ad9b3be64932a808e9dc614a9008606b0231c78eecf4b78d502f6915607e52af1
-  data.tar.gz: 7b3f8272981305f36b9762050f5fc6ca742d8e7cff122c4e041d7b3e4ba214851a029e4aff3beb129ec8a9b56139374a5f71480088e9e2bc16d9cf71b9b585d3
+  metadata.gz: 59cc678e76ce6dbd0d88fcef353eeef743185f4d78fa27dde69a84b7bc7779b1fc50d35c4ab1a2cb3d0a43588c0b866460838459b6499a7620074cb076922e88
+  data.tar.gz: 94ef68e78d3e118385b91b26ee3ac71123546a6535b05fbe8baeb3a41b197e5977c10fd4a19c66aad557c2443d5a717fe2c4152343bc03c1618567ab9ea5905f

data/data/default_world.yaml

@@ -756,7 +756,20 @@ locations:
     begin: 5
     end: 6
     excl: false
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::RedKey
+    equipped: false
+    consumable: false
+    used: false
+    used_again: false
+    number_of_uses: 
+    name: red_key
+    name_display: Red Key
+    description: Redder than an embarrassed tomato in front of a moderate fire, but still very capable of being a key.
+    takeable: true
+    talkable: false
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false
@@ -1067,17 +1080,17 @@ locations:
     end: 20
     excl: false
   items:
-  - !ruby/object:Gemwarrior::SandJewel
+  - !ruby/object:Gemwarrior::LockerCorner
     equipped: false
     consumable: false
     used: false
     used_again: 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
+    name: locker_corner
+    name_display: Locker (Corner)
+    description: The top corner of what appears to be a small locker is slightly sticking up from the sand floor.
+    takeable: false
     useable: true
     equippable: false
   monsters_abounding: []
@@ -1660,6 +1673,19 @@ locations:
     takeable: false
     useable: true
     equippable: false
+  - !ruby/object:Gemwarrior::Shovel
+    equipped: false
+    consumable: false
+    used: false
+    used_again: false
+    number_of_uses: 
+    talkable: false
+    name: shovel
+    name_display: Shovel
+    description: You can really "dig" this tool, despite its well-worn appearance.
+    takeable: true
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false

data/lib/gemwarrior/entities/entity.rb

@@ -45,11 +45,11 @@ module Gemwarrior
       'That does not appear to be useable.'
     end
 
-    def describe
+    def describe(world)
       desc_text = "#{description}".colorize(:white)
     end
 
-    def describe_detailed
+    def describe_detailed(world)
       desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
       desc_text << "(#{name})\n".colorize(:green)
       desc_text << "#{description}\n".colorize(:white)

data/lib/gemwarrior/entities/item.rb

@@ -21,7 +21,7 @@ module Gemwarrior
       'That item does not do anything...yet.'
     end
     
-    def describe_detailed
+    def describe_detailed(world)
       desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
       desc_text << "(#{name})\n".colorize(:green)
       desc_text << "#{description}\n".colorize(:white)

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

@@ -0,0 +1,43 @@
+# lib/gemwarrior/entities/items/locker.rb
+# Entity::Item::Locker
+
+require_relative '../item'
+
+module Gemwarrior
+  class Locker < Item
+    attr_accessor :locked
+  
+    def initialize
+      super
+
+      self.name         = 'locker'
+      self.name_display = 'Locker'
+      self.description  = 'A small, locked locker with a lock on it. You will need to unlock it to gain access to its insides.'
+      self.takeable     = false
+      self.locked       = true
+    end
+
+    def use(world)
+      cur_location = world.location_by_coords(world.player.cur_coords)
+      locker = cur_location.get_item_ref('locker')
+
+      if locker.locked
+        puts 'You pull on the lock, hoping it will unlock and leave the locker unlocked, but it is no good. You will need something else to unlock this locked locker.'
+
+        return { type: nil, data: nil }
+      else
+        if self.used
+          puts 'The locker is open and you can see a shiny gem inside.'
+
+          return { type: nil, data: nil }
+        else
+          self.used = true
+          puts 'You open the unlocked locker and look inside. Thereabouts, is a shiny gem of some sort.'
+          cur_location.add_item('sand_jewel')
+
+          return { type: nil, data: nil }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# lib/gemwarrior/entities/items/locker_corner.rb
+# Entity::Item::LockerCorner
+
+require_relative '../item'
+
+module Gemwarrior
+  class LockerCorner < Item
+    attr_accessor :locked
+
+    def initialize
+      super
+
+      self.name         = 'locker_corner'
+      self.name_display = 'Locker (Corner)'
+      self.description  = 'The top corner of what appears to be a small locker is slightly sticking up from the sand floor.'
+      self.takeable     = false
+      self.useable      = true
+    end
+
+    def use(world)
+      puts 'Pulling with all your might on the corner of the locker doesn\'t get it it budge one inch. Some other method is going to be needed.'
+
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+# lib/gemwarrior/entities/items/red_key.rb
+# Entity::Item::RedKey
+
+require_relative '../item'
+
+module Gemwarrior
+  class RedKey < Item
+    attr_accessor :locked
+
+    def initialize
+      super
+
+      self.name         = 'red_key'
+      self.name_display = 'Red Key'
+      self.description  = 'Redder than an embarrassed tomato in front of a moderate fire, but still very capable of being a key.'
+    end
+
+    def describe(world)
+      super
+
+      cur_location = world.location_by_coords(world.player.cur_coords)
+      if cur_location.name.eql?('pain_quarry-west')
+        return desc_text += ' The key "glows" quite intently.'.colorize(:red)
+      elsif cur_location.name.include?('pain_quarry')
+        return desc_text += ' The key "glows" almost so brightly you have to shield your eyes.'.colorize(:red)
+      else
+        return desc_text += ' The key lightly "glows".'.colorize(:red)
+      end
+    end
+
+    def describe_detailed(world)
+      desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
+      desc_text << "(#{name})\n".colorize(:green)
+      desc_text << "#{description}\n".colorize(:white)
+
+      cur_location = world.location_by_coords(world.player.cur_coords)
+      if cur_location.name.include?('pain_quarry')
+        desc_text += "The key O==> *glows* quite intently.\n".colorize(:red)
+      elsif cur_location.name.eql?('pain_quarry-west')
+        desc_text += "The key O==> *shines* almost so brightly you have to shield your eyes.\n".colorize(:red)
+      else
+        desc_text += "The key O==> lightly *shimmers*.\n".colorize(:red)
+      end
+
+      desc_text << "TAKEABLE?   #{takeable}\n".colorize(:white)
+      desc_text << "USEABLE?    #{useable}\n".colorize(:white)
+      desc_text << "TALKABLE?   #{talkable}\n".colorize(:white)
+      desc_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
+      desc_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
+      desc_text << "EQUIPPED?   #{equipped}\n".colorize(:white)
+      desc_text << "USED?       #{used}\n".colorize(:white)
+      desc_text << "USED AGAIN? #{used_again}\n".colorize(:white)
+      desc_text << "USES LEFT?  #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
+      desc_text
+    end
+
+    def use(world)
+      cur_location = world.location_by_coords(world.player.cur_coords)
+
+      if cur_location.contains_item?('locker')
+        locker = cur_location.get_item_ref('locker')
+        if locker.locked
+          puts 'You place the reddish key into the lock on the locker. Moments later, after a quick turn, the locked locker is no longer locked.'
+
+          locker.locked = false
+          locker.description = 'A small, unlocked locker with a lock on it. You have unlocked it with a reddish key you found.'
+          { type: nil, data: nil }
+        else
+          puts 'You place the reddish key into the lock on the locker. Moments later, after a quick turn, the locked locker is once again quite locked.'
+          
+          locker.locked = true
+          locker.description = 'A small, locked locker with a lock on it. You will need to unlock it to gain access to its insides.'
+          { type: nil, data: nil }
+        end
+      else
+        puts 'You try to put the key into one of its natural habitats, but can\'t find anything suitable.'
+
+        { type: nil, data: nil }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# lib/gemwarrior/entities/items/shovel.rb
+# Entity::Item::Shovel
+
+require_relative '../item'
+
+module Gemwarrior
+  class Shovel < Item
+    # CONSTANTS
+    DIG_NOISE = '*DIG*'
+  
+    def initialize
+      super
+
+      self.name         = 'shovel'
+      self.name_display = 'Shovel'
+      self.description  = 'You can really "dig" this tool, despite its well-worn appearance.'
+    end
+
+    def use(world)
+      cur_location = world.location_by_coords(world.player.cur_coords)
+
+      if cur_location.name.eql?('pain_quarry-west') and cur_location.contains_item?('locker_corner')
+        puts 'You bolster yourself and then begin the tedious job of digging the locker out of its several-inch-deep prison of sand with your trusty shovel.'
+        puts
+
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+
+        puts
+        puts 'You drop the head of the shovel into the ground, lean on it for a moment, and wipe the sweat from your brow. This quarry is really causing you considerable pain.'
+        STDIN.getc
+
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+        Animation.run(phrase: DIG_NOISE)
+
+        puts
+        puts 'After what feels like several hours, you finally unearth the locker from the ground, open it, and place it next to its previous location.'
+        
+        cur_location.add_item('locker')
+        cur_location.remove_item('locker_corner')
+        
+        { type: 'dmg', data: rand(1..2) }
+      else
+        puts 'You grip the shovel by its handle and thrust it, head-first, into the sky. Huzzah!'
+
+        { type: nil, data: nil }
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -11,6 +11,7 @@ module Gemwarrior
     DANGER_LEVEL              = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
     ERROR_ITEM_ADD_INVALID    = 'That item cannot be added to the location\'s inventory.'
     ERROR_ITEM_REMOVE_INVALID = 'That item cannot be removed as it does not exist here.'
+    ERROR_ITEM_REF_INVALID    = 'That item cannot be accessed.'
     ERROR_SPAWN_NAME_INVALID  = 'That monster does not exist in the game, and cannot be spawned.'
 
     attr_accessor :coords,
@@ -72,6 +73,17 @@ module Gemwarrior
       bosses_abounding.map{|b| b.name.downcase}.include?(boss_name.downcase)
     end
 
+    def get_item_ref(item_name)
+      all_items = GameItems.data | GameWeapons.data | GameArmor.data
+      all_items.each do |game_item|
+        if game_item.name.eql?(item_name)
+          item_ref = self.items.find{ |i| i.name.downcase == item_name.downcase }
+          return item_ref
+        end
+      end
+      return ERROR_ITEM_REF_INVALID
+    end
+
     def add_item(item_name_to_add)
       all_items = GameItems.data | GameWeapons.data | GameArmor.data
       all_items.each do |game_item|
@@ -80,7 +92,7 @@ module Gemwarrior
           return
         end
       end
-      return LOCATION_INVENTORY_ADD_ITEM_INVALID
+      return ERROR_ITEM_ADD_INVALID
     end
 
     def remove_item(item_name)

data/lib/gemwarrior/entities/player.rb

@@ -286,7 +286,7 @@ module Gemwarrior
       self.hp_cur = self.hp_cur - dmg.to_i
 
       if hp_cur <= 0
-        player_death
+        return player_death
       end
     end
 
@@ -362,7 +362,6 @@ module Gemwarrior
 
     def player_death
       puts 'Your actions have reduced you to death.'.colorize(:red)
-      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
 

data/lib/gemwarrior/evaluator.rb

@@ -256,7 +256,7 @@ module Gemwarrior
                   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."
+                  return "#{item.name.colorize(:yellow)} added to player inventory."
                 rescue
                   return ERROR_DEBUG_STAT_INV_PARAM_INVALID
                 end
@@ -555,8 +555,11 @@ module Gemwarrior
               player_cur_location = world.location_by_coords(world.player.cur_coords)
               world.describe(player_cur_location)
             when 'dmg'
-              world.player.take_damage(result[:data])
-              return
+              result = world.player.take_damage(result[:data])
+
+              if result.eql?('death')
+                player_death_resurrection
+              end
             when 'rest', 'health'
               world.player.heal_damage(result[:data])
               return

data/lib/gemwarrior/inventory.rb

@@ -132,14 +132,14 @@ module Gemwarrior
       battle_items
     end
 
-    def describe_item(item_name)
+    def describe_item(item_name, world)
       if contains_item?(item_name)
         self.items.each do |i|
           if i.name.eql?(item_name)
             if GameOptions.data['debug_mode']
-              return i.describe_detailed
+              return i.describe_detailed(world)
             else
-              return i.describe
+              return i.describe(world)
             end
           end
         end

data/lib/gemwarrior/repl.rb

@@ -147,6 +147,9 @@ module Gemwarrior
       puts '* Basic functions: look, go, character, inventory, attack *'
       puts '* Type \'help\' while in-game for complete list of commands *'
       puts '* Most commands can be abbreviated to their first letter  *'
+      puts '* Note: if something isn\'t working, try:                  *'
+      puts '*   1) starting a new game                                *'
+      puts '*   2) updating the game                                  *'
     end
 
     def display_log_of_attempts

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -70,9 +70,9 @@ module Gemwarrior
         point.items.each do |i|
           if i.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return i.describe_detailed
+              return i.describe_detailed(self)
             else
-              return i.describe
+              return i.describe(self)
             end
           end
         end
@@ -80,9 +80,9 @@ module Gemwarrior
         point.monsters_abounding.each do |m|
           if m.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return m.describe_detailed
+              return m.describe_detailed(self)
             else
-              return m.describe
+              return m.describe(self)
             end
           end
         end
@@ -90,14 +90,14 @@ module Gemwarrior
         point.bosses_abounding.each do |b|
           if b.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return b.describe_detailed
+              return b.describe_detailed(self)
             else
-              return b.describe
+              return b.describe(self)
             end
           end
         end
       elsif player.inventory.contains_item?(entity_name)
-        player.inventory.describe_item(entity_name)
+        player.inventory.describe_item(entity_name, self)
       else
         ERROR_DESCRIBE_ENTITY_INVALID
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 0.15.0
 platform: ruby
 authors:
 - Michael Chadwick
@@ -272,12 +272,16 @@ files:
 - lib/gemwarrior/entities/items/keystone.rb
 - lib/gemwarrior/entities/items/ladder.rb
 - lib/gemwarrior/entities/items/letter.rb
+- lib/gemwarrior/entities/items/locker.rb
+- lib/gemwarrior/entities/items/locker_corner.rb
 - lib/gemwarrior/entities/items/map.rb
 - lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/pedestal.rb
 - lib/gemwarrior/entities/items/pond.rb
+- lib/gemwarrior/entities/items/red_key.rb
 - lib/gemwarrior/entities/items/rope.rb
 - lib/gemwarrior/entities/items/sand_jewel.rb
+- lib/gemwarrior/entities/items/shovel.rb
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparkly_thing.rb