gemwarrior 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d23f8af0559e0e1e4e9c10e8efe4633b93a656
-  data.tar.gz: cf8fd7b6329334e50775ac624c876aa153497c22
+  metadata.gz: ca163fbb7cece3ec0bc218816843eaadab24bb3d
+  data.tar.gz: 9a9d951320df240ee8fdbd6fb6e5c9d328bda03c
 SHA512:
-  metadata.gz: 4eff96e788a696225658496179f81ce76667283e1aa2f7acf205030dec885ebd273a0a720db045b5bb880e644316f7e8ca2e83ed8011fd4ca9645fbd7296dbe1
-  data.tar.gz: bc0a5e110535abded6e6336692fc015f02c303e8c99a44da63e83e34650fe8896326ccbe25057ef88eb034167d6e124024ac8a571a161d258bd8f9b49c9d68ea
+  metadata.gz: 79b84db6709a927ef8d510b5a05d627693bab51b90867c2620af5cf17ace03d5a82945c704bc6250fa81ec6f1ac877f614d6f673b663de7e14ed0c6ab2cb0624
+  data.tar.gz: 6394216a50f001837169412e2b21fe6ea0b3ab5fd5828a7f4b4f4dc5620a96f20231c22958b42ff853ec6478c79e713bbad0203bb1a233cb1422577288da115f

data/data/default_world.yaml

@@ -8,7 +8,7 @@ locations:
     :x: 5
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -79,7 +79,7 @@ locations:
     :x: 6
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -102,7 +102,7 @@ locations:
     :x: 7
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -152,7 +152,7 @@ locations:
     :x: 7
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -175,7 +175,7 @@ locations:
     :x: 8
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -212,7 +212,7 @@ locations:
     :x: 8
     :y: 1
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -236,7 +236,7 @@ locations:
     :x: 8
     :y: 2
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -260,7 +260,7 @@ locations:
     :x: 8
     :y: 3
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -284,7 +284,7 @@ locations:
     :x: 8
     :y: 4
     :z: -1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -308,7 +308,7 @@ locations:
     :x: 7
     :y: 4
     :z: -1
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -332,7 +332,7 @@ locations:
     :x: 6
     :y: 4
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -356,7 +356,7 @@ locations:
     :x: 6
     :y: 5
     :z: -1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -380,7 +380,7 @@ locations:
     :x: 5
     :y: 5
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -404,7 +404,7 @@ locations:
     :x: 4
     :y: 5
     :z: -1
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -441,7 +441,7 @@ locations:
     :x: 5
     :y: 6
     :z: -1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -465,7 +465,7 @@ locations:
     :x: 5
     :y: 7
     :z: -1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -501,7 +501,7 @@ locations:
     :x: 5
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -524,7 +524,7 @@ locations:
     :x: 4
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -547,7 +547,7 @@ locations:
     :x: 3
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -570,7 +570,7 @@ locations:
     :x: 2
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -593,7 +593,7 @@ locations:
     :x: 1
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -616,7 +616,7 @@ locations:
     :x: 1
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -651,7 +651,7 @@ locations:
     :x: 2
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -674,7 +674,7 @@ locations:
     :x: 3
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -697,7 +697,7 @@ locations:
     :x: 4
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -720,7 +720,7 @@ locations:
     :x: 5
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -742,7 +742,7 @@ locations:
     :x: 8
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -777,7 +777,7 @@ locations:
     :x: 4
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -812,7 +812,7 @@ locations:
     :x: 4
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -835,7 +835,7 @@ locations:
     :x: 3
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -870,7 +870,7 @@ locations:
     :x: 3
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -904,7 +904,7 @@ locations:
     :x: 2
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -926,7 +926,7 @@ locations:
     :x: 2
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -948,7 +948,7 @@ locations:
     :x: 1
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: true
@@ -970,7 +970,7 @@ locations:
     :x: 1
     :y: 0
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -992,7 +992,7 @@ locations:
     :x: 0
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -1026,7 +1026,7 @@ locations:
     :x: 0
     :y: 2
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -1048,7 +1048,7 @@ locations:
     :x: 1
     :y: 2
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1070,7 +1070,7 @@ locations:
     :x: 5
     :y: 1
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1092,7 +1092,7 @@ locations:
     :x: 5
     :y: 2
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1115,7 +1115,7 @@ locations:
     :x: 5
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -1139,7 +1139,7 @@ locations:
     :x: 6
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -1163,7 +1163,7 @@ locations:
     :x: 7
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -1202,7 +1202,7 @@ locations:
     :x: 8
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: false
@@ -1234,7 +1234,7 @@ locations:
     :x: 4
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -1257,7 +1257,7 @@ locations:
     :x: 3
     :y: 3
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -1277,7 +1277,7 @@ locations:
     :x: 4
     :y: 4
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1300,7 +1300,7 @@ locations:
     :x: 4
     :y: 5
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1323,7 +1323,7 @@ locations:
     :x: 6
     :y: 4
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1346,7 +1346,7 @@ locations:
     :x: 6
     :y: 5
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -1369,7 +1369,7 @@ locations:
     :x: 7
     :y: 5
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -1392,7 +1392,7 @@ locations:
     :x: 7
     :y: 6
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1415,7 +1415,7 @@ locations:
     :x: 7
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: true
@@ -1449,7 +1449,7 @@ locations:
     :x: 8
     :y: 7
     :z: 0
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -1498,7 +1498,7 @@ locations:
     :x: 8
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1556,7 +1556,7 @@ locations:
     :x: 7
     :y: 8
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -1590,7 +1590,7 @@ locations:
     :x: 3
     :y: 5
     :z: 0
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -1664,7 +1664,7 @@ locations:
     :x: 8
     :y: 6
     :z: 1
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -1699,7 +1699,7 @@ locations:
     :x: 8
     :y: 7
     :z: 1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1763,7 +1763,7 @@ locations:
     :x: 7
     :y: 6
     :z: 1
-  locs_connected:
+  paths:
     :north: true
     :east: true
     :south: false
@@ -1797,7 +1797,7 @@ locations:
     :x: 7
     :y: 7
     :z: 1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1820,7 +1820,7 @@ locations:
     :x: 7
     :y: 8
     :z: 1
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: true
@@ -1856,7 +1856,7 @@ locations:
     :x: 8
     :y: 8
     :z: 1
-  locs_connected:
+  paths:
     :north: false
     :east: true
     :south: false
@@ -1893,7 +1893,7 @@ locations:
     :x: 8
     :y: 9
     :z: 1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1928,7 +1928,7 @@ locations:
     :x: 9
     :y: 8
     :z: 1
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: true
@@ -1963,7 +1963,7 @@ locations:
     :x: 9
     :y: 7
     :z: 1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: true
@@ -1986,7 +1986,7 @@ locations:
     :x: 9
     :y: 6
     :z: 1
-  locs_connected:
+  paths:
     :north: true
     :east: false
     :south: false
@@ -2033,7 +2033,7 @@ locations:
     :x: 5
     :y: 5
     :z: 2
-  locs_connected:
+  paths:
     :north: false
     :east: false
     :south: false

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

@@ -19,7 +19,7 @@ module Gemwarrior
     def use(world)
       forest_southwest = world.location_by_name('forest-southwest')
 
-      if forest_southwest.locs_connected[:west].eql? false
+      if forest_southwest.paths[:west].eql? false
         if !self.used
           puts 'Many books look interesting, including one specific volume entitled "Use Me Again to Attempt Unlocking the Way", by Not Very Subtle.'
           puts
@@ -33,7 +33,7 @@ module Gemwarrior
 
           case answer
           when 'mineral'
-            forest_southwest.locs_connected[:west] = true
+            forest_southwest.paths[:west] = true
             puts
             Animation.run(phrase: OPEN_TEXT)
             puts

data/lib/gemwarrior/entities/location.rb

@@ -13,7 +13,7 @@ module Gemwarrior
     ERROR_ITEM_REMOVE_INVALID = 'That item cannot be removed as it does not exist here.'
 
     attr_accessor :coords,
-                  :locs_connected,
+                  :paths,
                   :danger_level,
                   :monster_level_range,
                   :items,
@@ -21,6 +21,19 @@ module Gemwarrior
                   :bosses_abounding,
                   :checked_for_monsters
 
+    def initialize(options)
+      self.name                 = options.fetch(:name)
+      self.description          = options.fetch(:description)
+      self.coords               = options.fetch(:coords)
+      self.paths                = options.fetch(:paths)
+      self.danger_level         = options.fetch(:danger_level)
+      self.monster_level_range  = options.fetch(:monster_level_range)
+      self.items                = options.fetch(:items)
+      self.monsters_abounding   = options.fetch(:monsters_abounding)
+      self.bosses_abounding     = options.fetch[:bosses_abounding]
+      self.checked_for_monsters = false
+    end
+
     def describe
       desc_text =  name.ljust(30).upcase.colorize(:green)
       desc_text << coords.values.to_a.to_s.colorize(:white)
@@ -40,19 +53,6 @@ module Gemwarrior
       desc_text
     end
 
-    def initialize(options)
-      self.name                 = options.fetch(:name)
-      self.description          = options.fetch(:description)
-      self.coords               = options.fetch(:coords)
-      self.locs_connected       = options.fetch(:locs_connected)
-      self.danger_level         = options.fetch(:danger_level)
-      self.monster_level_range  = options.fetch(:monster_level_range)
-      self.items                = options.fetch(:items)
-      self.monsters_abounding   = options.fetch(:monsters_abounding)
-      self.bosses_abounding     = options.fetch[:bosses_abounding]
-      self.checked_for_monsters = false
-    end
-
     def contains_item?(item_name)
       self.items.map{|i| i.name.downcase}.include?(item_name.downcase)
     end
@@ -66,7 +66,7 @@ module Gemwarrior
     end
 
     def add_item(item_name_to_add)
-      all_items = GameItems.data || GameWeapons.data
+      all_items = GameItems.data | GameWeapons.data | GameArmor.data
       all_items.each do |game_item|
         if game_item.name.eql?(item_name_to_add)
           self.items.push(game_item)
@@ -78,7 +78,7 @@ module Gemwarrior
 
     def remove_item(item_name)
       if contains_item?(item_name)
-        items.reject! { |item| item.name == item_name }
+        self.items.delete_at(items.index(items.find { |i| i.name.downcase == item_name.downcase }))
       else
         ERROR_ITEM_REMOVE_INVALID
       end
@@ -100,7 +100,7 @@ module Gemwarrior
       when 'w'
         direction = 'west'
       end
-      locs_connected[direction.to_sym]
+      paths[direction.to_sym]
     end
 
     def monster_by_name(monster_name)
@@ -132,7 +132,36 @@ module Gemwarrior
     end
 
     def list_items
-      items.length > 0 ? items.map(&:name) : []
+      if items.empty?
+        []
+      else
+        item_hash = {}
+        self.items.map(&:name).each do |i|
+          i_sym = i.to_sym
+          if item_hash.keys.include? i_sym
+            item_hash[i_sym] += 1
+          else
+            item_hash[i_sym] = 1
+          end
+        end
+
+        if item_hash.length == 1
+          item_hash.each do |i, q|
+            q > 1 ? "#{q} #{i}s" : i
+          end
+        else
+          item_arr = []
+          item_hash.each do |i, q|
+            if q > 1
+              item_arr.push("#{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)} x#{q}")
+            else
+              item_arr.push(i)
+            end
+          end
+
+          return item_arr
+        end
+      end
     end
 
     def list_monsters
@@ -145,7 +174,7 @@ module Gemwarrior
 
     def list_paths
       valid_paths = []
-      locs_connected.each do |key, value|
+      self.paths.each do |key, value|
         if value
           valid_paths.push(key.to_s)
         end

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

@@ -49,7 +49,7 @@ module Gemwarrior
 
       # unlock northward travel
       river_bridge.description = 'The path northward on this well-constructed bridge is no longer blocked after your brutal scuffle with Jaspern, and yet the flowing river below seems unperturbed.'
-      river_bridge.locs_connected[:north] = true
+      river_bridge.paths[:north] = true
       return
     end
 

data/lib/gemwarrior/entities/player.rb

@@ -76,9 +76,10 @@ module Gemwarrior
 
       abilities = ''
       if special_abilities.empty?
-        abilities = 'none...yet(?)'
+        abilities = " none...yet(?)\n"
       else
         special_abilities.each do |sp|
+          abilities << "\n"
           abilities << "  #{Formatting.upstyle(sp.to_s).ljust(15).colorize(:yellow)}: #{PlayerLevels.get_ability_description(sp)}\n"
         end
       end
@@ -96,7 +97,7 @@ module Gemwarrior
       self_text << " (#{net_defense} w/ #{armor_slot})".colorize(:yellow) unless net_defense.nil?
       self_text << "\n"
       self_text << "DEXTERITY : #{self.dexterity}\n"
-      self_text << "ABILITIES :\n"
+      self_text << "ABILITIES :"
       self_text << "#{abilities}"
       
       if GameOptions.data['debug_mode']

data/lib/gemwarrior/evaluator.rb

@@ -583,7 +583,7 @@ module Gemwarrior
         if param1.nil?
           ERROR_DROP_PARAM_MISSING
         else
-          world.player.inventory.drop_item(param1)
+          world.player.inventory.drop_item(param1, player_cur_location)
         end
       when 'equip', 'eq'
         if param1.nil?

data/lib/gemwarrior/game.rb

@@ -4,6 +4,9 @@
 require 'colorize'
 require 'matrext'
 
+require_relative 'entities/armor/iron_helmet'
+require_relative 'entities/items/herb'
+require_relative 'entities/weapons/dagger'
 require_relative 'misc/animation'
 require_relative 'misc/audio'
 require_relative 'misc/formatting'
@@ -18,7 +21,7 @@ module Gemwarrior
   class Game
     # CONSTANTS
     INVENTORY_DEFAULT             = Inventory.new
-    INVENTORY_DEBUG               = Inventory.new([Herb.new])
+    INVENTORY_DEBUG               = Inventory.new([Herb.new, Herb.new, Herb.new])
     ROX_DEFAULT                   = 0
     ROX_DEBUG                     = 300
 

data/lib/gemwarrior/game_assets.rb

@@ -17,6 +17,10 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 
   module GameCreatures
@@ -28,6 +32,10 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 
   module GameItems
@@ -39,6 +47,10 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 
   module GameMonsters
@@ -50,6 +62,10 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 
   module GamePeople
@@ -61,6 +77,10 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 
   module GameWeapons
@@ -72,5 +92,9 @@ module Gemwarrior
     def self.data
       @@data ||= []
     end
+
+    def self.get(name)
+      self.data.find { |i| i.name.downcase == name.downcase }
+    end
   end
 end

data/lib/gemwarrior/inventory.rb

@@ -14,6 +14,7 @@ module Gemwarrior
     ERROR_ITEM_EQUIP_NONARMAMENT    = 'That item cannot be equipped.'
     ERROR_ITEM_UNEQUIP_INVALID      = 'You do not possess anything called that to unequip.'
     ERROR_ITEM_UNEQUIP_NONARMAMENT  = 'That item cannot be unequipped.'
+    VOWELS                          = 'aeiou'
 
     attr_accessor :items,
                   :weapon,
@@ -29,8 +30,50 @@ module Gemwarrior
       self.items.nil? || self.items.empty?
     end
 
+    def contents
+      is_empty? ? nil : list_contents
+    end
+
     def list_contents
-      is_empty? ? '[empty]' : "#{self.items.map(&:name).join(', ')}"
+      if is_empty?
+        'You possess nothing.'
+      else
+        item_hash = {}
+        self.items.map(&:name).each do |i|
+          i_sym = i.to_sym
+          if item_hash.keys.include? i_sym
+            item_hash[i_sym] += 1
+          else
+            item_hash[i_sym] = 1
+          end
+        end
+
+        if item_hash.length == 1
+          item_hash.each do |i, q|
+            if q > 1
+              return "You have #{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}."
+            else
+              article = VOWELS.include?(i[0]) ? 'an' : 'a'
+              return "You have #{article} #{i.to_s.colorize(:yellow)}."
+            end
+          end
+        else
+          item_list_text = 'You have '
+          item_arr = []
+          item_hash.each do |i, q|
+            if q > 1
+              item_arr.push("#{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}")
+            else
+              article = VOWELS.include?(i[0]) ? 'an' : 'a'
+              item_arr.push("#{article} #{i.to_s.colorize(:yellow)}")
+            end
+          end
+
+          item_arr[-1].replace("and #{item_arr[-1]}.")
+
+          return item_list_text << item_arr.join(', ')
+        end
+      end
     end
 
     def contains_item?(item_name)
@@ -77,10 +120,10 @@ module Gemwarrior
               i.equipped = true
               if i.is_weapon
                 self.weapon = i
-                return "The #{i.name} has taken charge, and been equipped."
+                return "The #{i.name.colorize(:yellow)} has taken charge, and been equipped."
               elsif i.is_armor
                 self.armor = i
-                return "The #{i.name} has fortified, and has been equipped."
+                return "The #{i.name.colorize(:yellow)} has fortified, and has been equipped."
               end
             else
               return ERROR_ITEM_EQUIP_NONARMAMENT
@@ -100,10 +143,10 @@ module Gemwarrior
               i.equipped = false
               if i.is_weapon
                 self.weapon = nil
-                return "The #{i.name} has been demoted to unequipped."
+                return "The #{i.name.colorize(:yellow)} has been demoted to unequipped."
               elsif i.is_armor
                 self.armor = nil
-                return "The #{i.name} has been demoted to unequipped."
+                return "The #{i.name.colorize(:yellow)} has been demoted to unequipped."
               end
             else
               return ERROR_ITEM_UNEQUIP_NONARMAMENT
@@ -128,7 +171,7 @@ module Gemwarrior
               # stats
               player.items_taken += 1
 
-              return "Added #{item_name} to your increasing collection of bits of tid.".colorize(:green)
+              return "#{"Added".colorize(:green)} #{item_name.colorize(:yellow)} #{"to your increasing collection of bits of tid".colorize(:green)}."
             else
               return ERROR_ITEM_ADD_UNTAKEABLE.colorize(:red)
             end
@@ -138,29 +181,21 @@ module Gemwarrior
       ERROR_ITEM_ADD_INVALID.colorize(:red)
     end
 
+    def drop_item(item_name, cur_loc)
+      if contains_item?(item_name)
+        remove_item(item_name)
+        cur_loc.add_item(item_name)
+        "You dropped #{item_name.colorize(:yellow)}."
+      else
+        ERROR_ITEM_REMOVE_INVALID
+      end
+    end
+
     def remove_item(item_name)
       self.items.delete_at(self.items.map(&:name).index(item_name) || self.items.length)
       unless self.weapon.nil?
         self.weapon = nil if self.weapon.name.eql?(item_name)
       end
     end
-
-    def drop_item(item_name)
-      if contains_item?(item_name)
-        print "Are you sure you want to permanently throw away #{item_name}? (y/n) "
-        answer = gets.chomp.downcase
-
-        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."
-        else
-          return "You decide to keep #{item_name} for now."
-        end
-      else
-        ERROR_ITEM_REMOVE_INVALID
-      end
-    end
   end
 end

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -5,7 +5,6 @@ require_relative 'game_options'
 require_relative 'game_assets'
 require_relative 'inventory'
 require_relative 'entities/item'
-require_relative 'entities/items/herb'
 require_relative 'entities/location'
 require_relative 'entities/player'
 
@@ -218,7 +217,7 @@ module Gemwarrior
             z: floor.nil? ? self.player.cur_coords[:z] : floor.to_i
           }
           if self.player.cur_coords.eql?(cur_map_coords)
-            print '|O|'
+            print "|#{'O'.colorize(:cyan)}|"
           elsif location_by_coords(cur_map_coords)
             print '|X|'
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os