gemwarrior 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02d5526a735c39b33dd88a5bc4ca62fbecbcf68
-  data.tar.gz: 23b403831920ce94db83189ccbe68369f5b39f73
+  metadata.gz: 67ea8f41e66cefdb26f55bab9513248528d266dd
+  data.tar.gz: f4aa74c3a8220b407c712e33e26231415b984c71
 SHA512:
-  metadata.gz: 44224c01dabd51cada90e1575872979819712c06e6a002a7690360de6a0df2f1f8d08a26163db6a8911a3d505fc10e5c7de8aa6091e92f1b7038b2ea2527e04c
-  data.tar.gz: 1879e4167fd293d048da3e9d91e7040a7c4cb0db9e020c7fa9999f1c99ce7b8c5688c7f9574d88561b216b9b91bc1645877fc5c23ab279a2b3d8673129ccb7df
+  metadata.gz: 796d0ac2f729bbf56141ce0c332b624d621b255d700d3612b00e19586c57480126d315d9e585aecbbed20fdf357eb5e129959574798a0a4a68b3677b5443fea2
+  data.tar.gz: a1d75556f09323bff027fa802e0efad73bebf1581f7d9351e6d8b06d494216cb468e90277e8357c2b441fc95473c3969c25935aee38233083b0512d9d66d8710

data/lib/gemwarrior/battle.rb

@@ -12,6 +12,9 @@ module Gemwarrior
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
     BEAST_MODE_ATTACK           = 100
     
+    ## MESSAGES
+    TEXT_ESCAPE                 = 'POOF'
+    
     attr_accessor :world, :player, :monster
     
     def initialize(options)
@@ -48,20 +51,30 @@ module Gemwarrior
         end
         
         puts
-        puts  "PLAYER  :: #{player.hp_cur.to_s.rjust(3)} HP"
+        print "PLAYER  :: #{player.hp_cur.to_s.rjust(3)} HP"
+        if world.debug_mode
+          print " (LVL: #{player.level})"
+        end
+        print "\n"
+        
         print "MONSTER :: "
         if world.debug_mode || PlayerLevels::get_level_stats(player.level)[:special_abilities].include?(:rocking_vision)
           print "#{monster.hp_cur.to_s.rjust(3)}"
         else
           print "???"
         end
-        print " HP\n"
+        print " HP"
+        if world.debug_mode
+          print " (LVL: #{monster.level})"
+        end
+        print "\n"
         puts
         
         puts 'What do you do?'
         puts "[Fight/Attack][Look][Run]".colorize(:color => :yellow)
-        cmd = gets.chomp.downcase
         
+        cmd = gets.chomp.downcase
+
         # player action
         case cmd
         when 'fight', 'f', 'attack', 'a'
@@ -77,8 +90,16 @@ module Gemwarrior
             puts "You miss entirely!".colorize(:yellow)
           end
         when 'look', 'l'
-          puts "#{monster.name} (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}"
-          puts "Its got some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
+          print "#{monster.name}".colorize(:white)
+          print " (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}\n"
+          puts "It has some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
+          if world.debug_mode
+            puts "If defeated, will receive:"
+            puts " >> XP   : #{monster.xp}"
+            puts " >> ROX  : #{monster.rox}"
+            puts " >> ITEMS: #{monster.inventory.list_contents}"
+            next
+          end
         when 'run', 'r'
           if player_escape?
             monster.hp_cur = monster.hp_max
@@ -100,22 +121,9 @@ module Gemwarrior
     
     private
     
-    def monster_strikes_first?
-      if (monster.dexterity > player.dexterity)
-        return true
-      else
-        dex_diff = player.dexterity - monster.dexterity
-        rand_dex = rand(0..dex_diff)
-        if rand_dex % 2 > 0
-          return true
-        else
-          return false
-        end
-      end
-    end
-    
+    # NEUTRAL   
     def calculate_damage_to(entity)
-      miss = rand(0..100)
+      miss = rand(0..(100 + entity.defense))
       if (miss < 15)
         0
       else
@@ -148,6 +156,21 @@ module Gemwarrior
       return hit.join
     end
     
+    # MONSTER
+    def monster_strikes_first?
+      if (monster.dexterity > player.dexterity)
+        return true
+      else
+        dex_diff = player.dexterity - monster.dexterity
+        rand_dex = rand(0..dex_diff)
+        if rand_dex % 2 > 0
+          return true
+        else
+          return false
+        end
+      end
+    end
+    
     def monster_attacks_player
       puts "#{monster.name} attacks you!"
       dmg = calculate_damage_to(player)
@@ -160,16 +183,7 @@ module Gemwarrior
         puts "#{monster.name} misses entirely!".colorize(:yellow)
       end
     end
-    
-    def calculate_monster_damage
-      miss = rand(0..100)
-      if (miss < 15)
-        0
-      else
-        rand(player.atk_lo..player.atk_hi)
-      end
-    end
-    
+
     def monster_near_death?
       ((monster.hp_cur.to_f / monster.hp_max.to_f) < 0.10)
     end
@@ -194,20 +208,30 @@ module Gemwarrior
         end
       else
         puts 'You get the following spoils of war:'
-        puts " XP : #{monster.xp}".colorize(:green)
-        puts " ROX: #{monster.rox}".colorize(:green)
+        puts " XP   : #{monster.xp}".colorize(:green)
+        puts " ROX  : #{monster.rox}".colorize(:green)
+        unless monster.inventory.nil?
+          puts " ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
+        end
         print_battle_line
         update_player_stats
         world.location_by_coords(player.cur_coords).remove_monster(monster.name)
       end
     end
     
+    # PLAYER
     def update_player_stats
       old_player_level = PlayerLevels::check_level(player.xp)
       
       player.xp = player.xp + monster.xp
       player.rox = player.rox + monster.rox
       
+      monster_items = monster.inventory.items
+      binding.pry
+      unless monster_items.nil?
+        player.inventory.items.concat monster_items unless monster_items.empty?
+      end
+      
       new_player_level = PlayerLevels::check_level(player.xp)
       
       if new_player_level > old_player_level
@@ -266,7 +290,7 @@ module Gemwarrior
     def print_escape_text
       escape = Thread.new do
         print "* "
-        print "#{Matrext::process({ :phrase => 'POOF', :oneline => true })}"
+        print "#{Matrext::process({ :phrase => TEXT_ESCAPE, :oneline => true })}"
         print " *\n"
       end
       return escape.join

data/lib/gemwarrior/entities/entity.rb

@@ -7,8 +7,8 @@ module Gemwarrior
                   :description
 
     def status
-      status_text =  name.ljust(26).upcase
-      status_text << "#{description}\n"
+      status_text =  name.ljust(26).upcase.colorize(:green)
+      status_text << "#{description}\n".colorize(:white)
     end
   end
 end

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

@@ -17,8 +17,8 @@ module Gemwarrior
     end
     
     def use
-      puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat worse after getting back up.'
-      puts
+      puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat better after getting back up.'
+      puts 'You regain a hit point.'
       {:type => 'rest', :data => 1}
     end
   end

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/herb.rb
+# Item::Herb
+
+require_relative '../item'
+
+module Gemwarrior
+  class Herb < Item
+    def initialize
+      self.name         = 'herb'
+      self.description  = 'Green and leafy, this wild herb looks edible.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use
+      puts 'You place the herb in your mouth, testing its texture. The mysterious herb is easily chewable, and you are able to swallow it without much effort. Slight tingles travel up and down your spine.'
+      puts 'You regain a few hit points.'
+      {:type => 'health', :data => rand(3..5)}
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Gemwarrior
   class TowerSwitch < Item
     def initialize
       self.name         = 'tower_switch'
-      self.description  = 'A pedestal about 4 feet in height rises up from the ground, a switch atop it. It is labeled "Tower" and the choices are "Yes" and "No". It is currently set to "No".'
+      self.description  = 'A pedestal about 4 feet in height rises up from the ground, a switch atop it. It is labeled "Tower" with choices for "Yes" and "No". It is set to "No".'
       self.atk_lo       = nil
       self.atk_hi       = nil
       self.takeable     = false

data/lib/gemwarrior/entities/location.rb

@@ -28,10 +28,12 @@ module Gemwarrior
       self.checked_for_monsters = false
     end
     
-    def status
-      status_text =  name.ljust(26).upcase
-      status_text << coords.values.to_a.to_s
-      status_text << " #{description}\n"
+    def status(debug_mode = false)
+      status_text =  name.ljust(26).upcase.colorize(:green)
+      status_text << coords.values.to_a.to_s.colorize(:white)
+      status_text << " DL[#{danger_level.to_s.ljust(8)}] ".colorize(:white) if debug_mode
+      status_text << " MLR[#{monster_level_range.to_s.ljust(6)}] ".colorize(:white) if debug_mode
+      status_text << " #{description}\n".colorize(:white)
     end
     
     def remove_item(item_name)
@@ -90,15 +92,27 @@ module Gemwarrior
     end
     
     def list_items
-      return "\n >> Curious object(s): #{items.map(&:name).join(', ')}" if items.length > 0
+      if items.length > 0
+        items.map(&:name)
+      else
+        []
+      end
     end
     
     def list_monsters
-      return "\n >> Monster(s) abound: #{monsters_abounding.map(&:name).join(', ')}" if monsters_abounding.length > 0
+      if monsters_abounding.length > 0
+        monsters_abounding.map(&:name)
+      else
+        []
+      end
     end
     
     def list_bosses
-      return "\n >> Boss(es) abound: #{bosses_abounding.map(&:name).join(', ')}" if bosses_abounding.length > 0
+      if bosses_abounding.length > 0
+        bosses_abounding.map(&:name)
+      else
+        []
+      end
     end
     
     def list_paths
@@ -108,7 +122,15 @@ module Gemwarrior
           valid_paths.push(key.to_s)
         end
       end
-      return "\n >> Paths: #{valid_paths.join(', ')}"
+      return valid_paths
+    end
+    
+    def list_actionable_words
+      actionable_words =  []
+      actionable_words.push(monsters_abounding.map(&:name)) unless monsters_abounding.empty?
+      actionable_words.push(bosses_abounding.map(&:name))   unless bosses_abounding.empty?
+      actionable_words.push(items.map(&:name))              unless items.empty?
+      actionable_words.join(', ')
     end
     
     def populate_monsters(monsters_available)
@@ -120,7 +142,7 @@ module Gemwarrior
         # get random non-boss monster
         loop do
           random_monster = monsters_available[rand(0..monsters_available.length-1)]
-          unless random_monster.is_boss
+          unless random_monster.is_boss || !self.monster_level_range.include?(random_monster.level)
             break
           end
         end

data/lib/gemwarrior/entities/monster.rb

@@ -2,24 +2,36 @@
 # Monster creature
 
 require_relative 'creature'
+require_relative 'items/herb'
 
 module Gemwarrior
   class Monster < Creature
-    attr_accessor :battlecry, :is_boss
+    INVENTORY_ITEMS_DEFAULT = [Herb.new]
+  
+    attr_accessor :inventory, :battlecry, :is_boss
 
+    def initialize
+      if [true, false].sample
+        self.inventory = Inventory.new([INVENTORY_ITEMS_DEFAULT[rand(0..INVENTORY_ITEMS_DEFAULT.length-1)]])
+      else
+        self.inventory = Inventory.new
+      end
+    end
+    
     def describe
-      status_text =  name.upcase.ljust(26)
-      status_text << "LEVEL: #{level.to_s.rjust(2)}, "
-      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)} "
-      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} "
-      status_text << "DEF: #{defense.to_s.rjust(2)} "
-      status_text << "DEX: #{dexterity.to_s.rjust(2)} "
-      status_text << "ROX: #{rox.to_s.rjust(3)} "
-      status_text << "XP: #{xp.to_s.rjust(3)} "
-      status_text << "FACE: #{face.ljust(12)} "
-      status_text << "HANDS: #{hands.ljust(12)} "
-      status_text << "MOOD: #{mood.ljust(12)}"
-      status_text << "INV: #{inventory.list_contents}\n"
+      status_text =  name.upcase.ljust(26).colorize(:green)
+      status_text << "LEVEL: #{level.to_s.rjust(2)}, ".colorize(:white)
+      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)} ".colorize(:white)
+      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} ".colorize(:white)
+      status_text << "DEF: #{defense.to_s.rjust(2)} ".colorize(:white)
+      status_text << "DEX: #{dexterity.to_s.rjust(2)} ".colorize(:white)
+      status_text << "ROX: #{rox.to_s.rjust(3)} ".colorize(:white)
+      status_text << "XP: #{xp.to_s.rjust(3)} ".colorize(:white)
+      status_text << "FACE: #{face.ljust(12)} ".colorize(:white)
+      status_text << "HANDS: #{hands.ljust(12)} ".colorize(:white)
+      status_text << "MOOD: #{mood.ljust(12)}".colorize(:white)
+      status_text << "INV: #{inventory.list_contents}".colorize(:white)
+      status_text << "\n"
     end
   end
 end

data/lib/gemwarrior/entities/monsters/alexandrat.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Alexandrat < Monster
     def initialize
+      super
+    
       self.name         = 'alexandrat'
       self.description  = 'Tiny, but fierce, color-changing rodent.'
       self.face         = 'ugly'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(level..(level * 1.5).floor)
       self.dexterity    = rand(1..3)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/amberoo.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Amberoo < Monster
     def initialize
+      super
+    
       self.name         = 'amberoo'
       self.description  = 'Fossilized and jumping around like an adorably dangerous threat from the past.'
       self.face         = 'punchy'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand((level * 2)..(level * 2.5).floor)
       self.dexterity    = rand(3..4)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/amethystle.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Amethystle < Monster
     def initialize
+      super
+    
       self.name         = 'amethystle'
       self.description  = 'Sober and contemplative, it moves with purplish tentacles swaying in the breeze.'
       self.face         = 'sharp'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(2..4)
       self.dexterity    = rand(1..2)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/apatiger.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Apatiger < Monster
     def initialize
+      super
+
       self.name         = 'apatiger'
       self.description  = 'Apathetic about most everything as it lazes around, save for eating you.'
       self.face         = 'calloused'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(4..7)
       self.dexterity    = rand(3..7)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/aquamarine.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Aquamarine < Monster
     def initialize
+      super
+    
       self.name         = 'aquamarine'
       self.description  = 'It is but one of the few, the proud, the underwater.'
       self.face         = 'strained'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(3..5)
       self.dexterity    = rand(4..6)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/bloodstorm.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Bloodstorm < Monster
     def initialize
+      super
+    
       self.name         = 'bloodstorm'
       self.description  = 'A literal swirling, maniacal vortex of human hemoglobin.'
       self.face         = 'bloody'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(6..7)
       self.dexterity    = rand(5..7)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/citrinaga.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Citrinaga < Monster
     def initialize
+      super
+    
       self.name         = 'citrinaga'
       self.description  = 'Refreshing in its shiny, gleaming effectiveness at ending your life.'
       self.face         = 'shiny'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(7..9)
       self.dexterity    = rand(6..7)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 3))
       

data/lib/gemwarrior/entities/monsters/coraliz.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Coraliz < Monster
     def initialize
+      super
+    
       self.name         = 'coraliz'
       self.description  = 'Small blue lizard that slithers around, nipping at your ankles.'
       self.face         = 'spotted'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(4..6)
       self.dexterity    = rand(7..9)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 3))
       

data/lib/gemwarrior/entities/monsters/cubicat.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Cubicat < Monster
     def initialize
+      super
+    
       self.name         = 'cubicat'
       self.description  = 'Perfectly geometrically cubed feline, fresh from its woven enclosure, claws at the ready.'
       self.face         = 'striking'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(5..7)
       self.dexterity    = rand(8..10)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/monsters/diaman.rb

@@ -6,6 +6,8 @@ require_relative '../monster'
 module Gemwarrior
   class Diaman < Monster
     def initialize
+      super
+    
       self.name         = 'diaman'
       self.description  = 'Crystalline structure in the form of a man, lumbering toward you, with outstretched, edged pincers.'
       self.face         = 'bright'
@@ -20,7 +22,6 @@ module Gemwarrior
       self.defense      = rand(5..7)
       self.dexterity    = rand(8..10)
 
-      self.inventory    = Inventory.new
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))
       

data/lib/gemwarrior/entities/player.rb

@@ -163,6 +163,13 @@ module Gemwarrior
         player_death
       end
     end
+    
+    def heal_damage(dmg)
+      self.hp_cur = self.hp_cur + dmg.to_i
+      if self.hp_cur > self.hp_max
+        self.hp_cur = self.hp_max
+      end
+    end
 
     private
 

data/lib/gemwarrior/evaluator.rb

@@ -113,7 +113,7 @@ module Gemwarrior
           end
         when 'map', 'm'
           world.print_map
-        when 'stat', 'st'
+        when 'stat', 's'
           if param1.nil?
             puts ERROR_DEBUG_STAT_PARAM_MISSING
             return DEBUG_STAT_PARAMS
@@ -230,11 +230,8 @@ module Gemwarrior
             when 'dmg'
               world.player.take_damage(result[:data])
               return
-            when 'rest'
-              world.player.hp_cur = world.player.hp_cur + result[:data]
-              if world.player.hp_cur > world.player.hp_max
-                world.player.hp_cur = world.player.hp_max
-              end
+            when 'rest', 'health'
+              world.player.heal_damage(result[:data])
               return
             else
               return
@@ -330,9 +327,10 @@ module Gemwarrior
         i = i + 1
       end
       print_separator
-      puts " DEBUG COMMANDS"
-      print_separator
+      
       if world.debug_mode
+        puts " DEBUG COMMANDS"
+        print_separator
         i = 0
         devcommands.each do |cmd|
           puts " #{cmd.ljust(9)}, #{devaliases[i].ljust(2)} -- #{devcmd_descriptions[i]}"

data/lib/gemwarrior/inventory.rb

@@ -22,7 +22,7 @@ module Gemwarrior
     end
     
     def list_contents
-      if items.empty?
+      if items.nil? || items.empty?
         return contents_text = '[empty]'
       else
         return contents_text = "#{items.map(&:name).join ', '}"

data/lib/gemwarrior/misc/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/gemwarrior/repl.rb

@@ -49,10 +49,14 @@ module Gemwarrior
       end
     end
     
-    def print_splash_message
+    def print_logo
       puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
       puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
       puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
+    end
+    
+    def print_splash_message
+      print_logo
       0.upto(SPLASH_MESSAGE.length-1) do print '=' end
       puts
       puts SPLASH_MESSAGE

data/lib/gemwarrior/world.rb

@@ -71,7 +71,7 @@ module Gemwarrior
         puts '[PLAYERS]'
         player.check_self(false)
       when 'monsters'
-        puts '[MONSTERS]'
+        puts "[MONSTERS](#{monsters.length})"
         if details
           monsters.map { |m| print m.describe unless m.is_boss}
           monsters.map { |m| print m.describe if m.is_boss }
@@ -80,7 +80,13 @@ module Gemwarrior
           monster_text =  ">> monsters: #{monsters.map(&:name).join(', ')}"
         end
       when 'items'
-        puts '[ITEMS]'
+        item_count = 0
+        locations.each do |l|
+          l.items.each do |i|
+            item_count = item_count + 1
+          end
+        end
+        puts "[ITEMS](#{item_count})"
         if details
           locations.each do |l|
             l.items.map { |i| print i.status }
@@ -94,9 +100,9 @@ module Gemwarrior
           ">> #{item_list.sort.join(', ')}"
         end
       when 'locations'
-        puts '[LOCATIONS]'
+        puts "[LOCATIONS](#{locations.length})"
         if details
-          locations.map { |l| print l.status }
+          locations.map { |l| print l.status(self.debug_mode) }
           return
         else
           ">> #{locations.map(&:name).join(', ')}"
@@ -126,37 +132,62 @@ module Gemwarrior
  
     def describe(point)
       desc_text = ""
-      desc_text << "[ #{point.name} ]\n"
+      desc_text << "[ #{point.name} ]".colorize(:green)
+      
+      if debug_mode
+        desc_text << " DL[#{point.danger_level.to_s}] MLR[#{point.monster_level_range.to_s}]".colorize(:yellow)
+      end
+      
+      desc_text << "\n"
       desc_text << point.description
       
       point.populate_monsters(self.monsters) unless point.checked_for_monsters?
       
-      desc_text << point.list_items     unless point.list_items.nil?
-      desc_text << point.list_monsters  unless point.list_monsters.nil?
-      desc_text << point.list_bosses    unless point.list_bosses.nil?
-      desc_text << point.list_paths
+      desc_text << "\n >> Curious object(s): #{point.list_items.join(', ')}" unless point.list_items.empty?
+      desc_text << "\n >> Monster(s) abound: #{point.list_monsters.join(', ')}" unless point.list_monsters.empty?
+      desc_text << "\n >> Boss(es) abound: #{point.list_bosses.join(', ')}" unless point.list_bosses.empty?
+      desc_text << "\n >> Paths: #{point.list_paths.join(', ')}"
+      
+      if debug_mode
+        desc_text << "\n >>> Actionable words: "
+        desc_text << point.list_actionable_words.colorize(:white)
+      end
+      
+      return desc_text
     end
     
     def describe_entity(point, entity_name)
-      if point.items.map(&:name).include?(entity_name)
+      if point.list_items.map{|i| i.downcase}.include?(entity_name)
         point.items.each do |i|
-          if i.name.eql?(entity_name)
-            return "#{i.description}"
+          if i.name.downcase.eql?(entity_name.downcase)
+            if debug_mode
+              return i.status
+            else
+              return i.description
+            end
           end
         end
       elsif
-        if point.monsters_abounding.map(&:name).include?(entity_name)
+        if point.list_monsters.map{|m| m.downcase}.include?(entity_name)
           point.monsters_abounding.each do |m|
-            if m.name.eql?(entity_name)
-              return "#{m.description}"
+            if m.name.downcase.eql?(entity_name.downcase)
+              if debug_mode
+                return m.describe
+              else
+                return m.description
+              end
             end
           end
         end
       elsif
-        if point.bosses_abounding.map(&:name).include?(entity_name)
+        if point.list_bosses.map{|b| b.downcase}.include?(entity_name)
           point.bosses_abounding.each do |b|
-            if b.name.eql?(entity_name)
-              return "#{b.description}"
+            if b.name.downcase.eql?(entity_name.downcase)
+              if debug_mode
+                return b.describe
+              else
+                return b.description
+              end
             end
           end
         end
@@ -238,7 +269,7 @@ module Gemwarrior
       )
       locations.push(Location.new({
           :name                 => 'Cave (Antechamber)', 
-          :description          => 'Now inside the entrance to the cavern, you confirm that there are stacktites, stonemites, rocksites, and even one or two pebblejites.',
+          :description          => 'Now inside the cavern, you confirm there are stacktites, stonemites, rocksites, and even some pebblejites.',
           :coords               => {:x => 7, :y => 0},
           :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
           :danger_level         => :moderate,
@@ -381,7 +412,7 @@ module Gemwarrior
       )
       locations.push(Location.new({
           :name                 => 'Sky Tower (Armory)', 
-          :description          => 'Weapons of all kinds litter the ground and are hung on hooks from the wall, assumedly for use against assailants who might try to storm the tower.',
+          :description          => 'Weapons of all kinds litter the ground and are hung on hooks from the wall. Tower assailants beware/rejoice!',
           :coords               => {:x => 4, :y => 4},
           :locs_connected       => {:north => true, :east => true, :south => false, :west => false},
           :danger_level         => :moderate,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -186,6 +186,7 @@ files:
 - lib/gemwarrior/entities/items/floor_tile.rb
 - lib/gemwarrior/entities/items/flower.rb
 - lib/gemwarrior/entities/items/gun.rb
+- lib/gemwarrior/entities/items/herb.rb
 - lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/sparklything.rb
 - lib/gemwarrior/entities/items/stalactite.rb