gemwarrior 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214b51cef137a58bb89714b22d1dcaf53887e0e1
-  data.tar.gz: 511f3f3531a5923e1a17278262ac218325db4b5a
+  metadata.gz: f02d5526a735c39b33dd88a5bc4ca62fbecbcf68
+  data.tar.gz: 23b403831920ce94db83189ccbe68369f5b39f73
 SHA512:
-  metadata.gz: 44b68d28a14d5ebe2935fbc0a3bee80a180562eed4fa610df9444db642e28e220114601a1cbc84701be63525893a02ba27d4359da29f8101e806ee26b086794e
-  data.tar.gz: c967f7f4af2aa97602990437eb9a5179e6acdd4ca800ee79b2766c1541427f6c311be0f69fa2b478a060c8f7e1fd08c87057b1cdc0b899f77d30f2eb9a72dbd7
+  metadata.gz: 44224c01dabd51cada90e1575872979819712c06e6a002a7690360de6a0df2f1f8d08a26163db6a8911a3d505fc10e5c7de8aa6091e92f1b7038b2ea2527e04c
+  data.tar.gz: 1879e4167fd293d048da3e9d91e7040a7c4cb0db9e020c7fa9999f1c99ce7b8c5688c7f9574d88561b216b9b91bc1645877fc5c23ab279a2b3d8673129ccb7df

data/lib/gemwarrior/entities/item.rb

@@ -10,6 +10,11 @@ module Gemwarrior
                   :takeable, 
                   :useable, 
                   :equippable, 
-                  :equipped
+                  :equipped,
+                  :use
+    
+    def use
+      'That items does not do anything...yet'
+    end
   end
 end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/apple.rb
+# Item::Apple
+
+require_relative '../item'
+
+module Gemwarrior
+  class Apple < Item
+    def initialize
+      self.name         = 'apple'
+      self.description  = 'Reddish-orangeish in color, this fruit looks sweet, but it is heavy and feels more like a rock you would sooner not bite into.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -15,5 +15,11 @@ module Gemwarrior
       self.equippable   = false
       self.equipped     = false
     end
+    
+    def use
+      puts 'You unmake the bed, get under the covers, close your eyes, and begin to think about all the things you need to do today. You realize sleep is not one of them and quickly get back up, remake the bed, and get on about your day.'
+      puts 'You regain a few hit points.'
+      {:type => 'rest', :data => 5}
+    end
   end
 end

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/couch.rb
+# Item::Couch
+
+require_relative '../item'
+
+module Gemwarrior
+  class Couch < Item
+    def initialize
+      self.name         = 'couch'
+      self.description  = 'Ever wanted to sit on a cloud? Now is your chance.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    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
+      {:type => 'rest', :data => 1}
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/cup.rb
+# Item::Cup
+
+require_relative '../item'
+
+module Gemwarrior
+  class Cup < Item
+    def initialize
+      self.name         = 'cup'
+      self.description  = 'A nice, stone mug, perfect for putting things into and then using to carry such things from place to place.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/dehumidifier.rb
+# Item::Dehumidifier
+
+require_relative '../item'
+
+module Gemwarrior
+  class Dehumidifier < Item
+    def initialize
+      self.name         = 'dehumidifier'
+      self.description  = 'Petals the color of clear sky and a stem of bright white. A most curious plant.'
+      self.atk_lo       = 2
+      self.atk_hi       = 4
+      self.takeable     = true
+      self.useable      = false
+      self.equippable   = true
+      self.equipped     = false
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Gemwarrior
       self.atk_lo       = nil
       self.atk_hi       = nil
       self.takeable     = true
-      self.useable      = true
+      self.useable      = false
       self.equippable   = false
       self.equipped     = false
     end

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

@@ -0,0 +1,32 @@
+# lib/gemwarrior/entities/items/floor_tile.rb
+# Item::FloorTile
+
+require_relative '../item'
+
+module Gemwarrior
+  class FloorTile < Item
+    def initialize
+      self.name         = 'floor_tile'
+      self.description  = 'One of the floor tiles, rough-hewn but immaculate, looks...off. Pressable, even.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use
+      puts 'You slowly lower your foot onto the tile, and then gently depress it, through the floor. Your whole body begins to feel light, lifeless. You black out.'
+      puts
+      
+      t = Thread.new do
+        print "#{Matrext::process({ :phrase => '*** SHOOOOOM ***', :oneline => true })}"
+        puts
+      end
+      t.join
+      
+      {:type => 'move', :data => 'Sky Tower (Entrance)'}
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/flower.rb
+# Item::Flower
+
+require_relative '../item'
+
+module Gemwarrior
+  class Flower < Item
+    def initialize
+      self.name         = 'flower'
+      self.description  = 'Petals the color of clear sky and a stem of bright white. A most curious plant.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -15,5 +15,10 @@ module Gemwarrior
       self.equippable   = true
       self.equipped     = false
     end
+    
+    def use
+      puts 'You pull the trigger on the gun, but realize there are no bullets in it. So, it does not do much except cause a barely audible *click* sound.'
+      {:type => nil, :data => nil}
+    end
   end
 end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/massive_door.rb
+# Item::MassiveDoor
+
+require_relative '../item'
+
+module Gemwarrior
+  class MassiveDoor < Item
+    def initialize
+      self.name         = 'massive door'
+      self.description  = 'Translucent, but not transparent, this door constructed of condensed water vapor is like nothing you have ever seen.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ require_relative '../item'
 module Gemwarrior
   class SparklyThing < Item
     def initialize
-      self.name         = 'SparklyThing(tm)'
+      self.name         = 'Sparkly Thing(tm)'
       self.description  = 'The sparkling that this thing does is unimaginably brilliant.'
       self.atk_lo       = nil
       self.atk_hi       = nil
@@ -15,5 +15,11 @@ module Gemwarrior
       self.equippable   = false
       self.equipped     = false
     end
+    
+    def use
+      puts 'Everything, and I mean *everything*, begins to sparkle. Huh.'
+      puts
+      {:type => nil, :data => nil}
+    end
   end
 end

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

@@ -11,7 +11,7 @@ module Gemwarrior
       self.atk_lo       = 2
       self.atk_hi       = 3
       self.takeable     = true
-      self.useable      = true
+      self.useable      = false
       self.equippable   = true
       self.equipped     = false
     end

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

@@ -11,7 +11,7 @@ module Gemwarrior
       self.atk_lo       = 2
       self.atk_hi       = 3
       self.takeable     = true
-      self.useable      = true
+      self.useable      = false
       self.equippable   = true
       self.equipped     = false
     end

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

@@ -0,0 +1,32 @@
+# lib/gemwarrior/entities/items/tower_switch.rb
+# Item::TowerSwitch
+
+require_relative '../item'
+
+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.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use
+      puts 'You move the switch from "No" to "Yes". Suddenly, a great wind picks up and you are gently lifted up by it. The ground moves away and your whole body begins to gently drift towards Emerald\'s compound high in the stratosphere.'
+      puts
+
+      t = Thread.new do
+        print "#{Matrext::process({ :phrase => '*** WHOOOOOSH ***', :oneline => true })}"
+        puts
+      end
+      t.join
+
+      {:type => 'move', :data => 'Sky Tower (Foyer)'}
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/waterfall.rb
+# Item::Waterfall
+
+require_relative '../item'
+
+module Gemwarrior
+  class Waterfall < Item
+    def initialize
+      self.name         = 'waterfall'
+      self.description  = 'Gallons of murky, sparkling water fall downward from an unknown spot in the sky, ending in a pool on the ground, yet never overflowing.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use
+      puts 'You stretch out your hand and touch the waterfall. It stings you with its cold and forceful gushing. Your hand is now wet and rougher than before. In time, it will dry.'
+      puts
+      {:type => 'dmg', :data => rand(0..1)}
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -12,7 +12,7 @@ module Gemwarrior
     ## ERRORS
     ERROR_LOCATION_ITEM_REMOVE_INVALID      = 'That item cannot be removed as it does not exist here.'
 
-    attr_accessor :coords, :locs_connected, :danger_level, :items, 
+    attr_accessor :coords, :locs_connected, :danger_level, :monster_level_range, :items, 
                   :monsters_abounding, :bosses_abounding, :checked_for_monsters
   
     def initialize(options)
@@ -21,6 +21,7 @@ module Gemwarrior
       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   = []
       self.bosses_abounding     = options[:bosses_abounding]

data/lib/gemwarrior/entities/player.rb

@@ -155,22 +155,22 @@ module Gemwarrior
         return nil
       end
     end
-
-    def switch_beast_mode
-      if self.beast_mode
-binding.pry
-        self.beast_mode = false
-        self.atk_lo = has_weapon_equipped? ? self.inventory.weapon.atk_lo : PlayerLevels::get_level_stats(self.level)[:atk_lo]
-        self.atk_hi = has_weapon_equipped? ? self.inventory.weapon.atk_hi : PlayerLevels::get_level_stats(self.level)[:atk_hi]
-      else
-        self.beast_mode = true
-        self.atk_lo = BEAST_MODE_ATTACK
-binding.pry
-        self.atk_hi = BEAST_MODE_ATTACK
+    
+    def take_damage(dmg)
+      self.hp_cur = self.hp_cur - dmg.to_i
+      
+      if hp_cur <= 0
+        player_death
       end
     end
-    
+
     private
+
+    def player_death
+      puts 'You\'re actions have reduced you to death.'.colorize(:red)
+      puts 'Your adventure ends here. Try again next time!'.colorize(:red)
+      exit(0)
+    end
     
     # TRAVEL    
     def print_traveling_text(direction_text)

data/lib/gemwarrior/evaluator.rb

@@ -7,15 +7,15 @@ module Gemwarrior
   class Evaluator
     # CONSTANTS
     ## MESSAGES
-    PROGRAM_NAME      = 'Gem Warrior'
-    QUIT_MESSAGE      = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
-    RESUME_MESSAGE    = 'Back to adventuring!'.colorize(:green)
-    SEPARATOR         = '=========================================================================='
+    PROGRAM_NAME                    = 'Gem Warrior'
+    QUIT_MESSAGE                    = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
+    RESUME_MESSAGE                  = 'Back to adventuring!'.colorize(:green)
+    SEPARATOR                       = '=========================================================================='
     
-    GO_PARAMS         = 'Options: north, east, south, west'
-    CHANGE_PARAMS     = 'Options: name'
-    DEBUG_LIST_PARAMS = 'Options: monsters, items, locations'
-    DEBUG_STAT_PARAMS = 'Options: atk_lo, atk_hi, strength, dexterity'
+    GO_PARAMS                       = 'Options: north, east, south, west'
+    CHANGE_PARAMS                   = 'Options: name'
+    DEBUG_LIST_PARAMS               = 'Options: monsters, items, locations'
+    DEBUG_STAT_PARAMS               = 'Options: atk_lo, atk_hi, strength, dexterity'
     
     ## ERRORS
     ERROR_COMMAND_INVALID           = 'That is not something the game yet understands.'
@@ -25,6 +25,9 @@ module Gemwarrior
     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.'
@@ -53,8 +56,8 @@ module Gemwarrior
         'Change player stat'
       ]
       
-      self.commands = %w(character inventory rest look take drop equip unequip go attack change help quit quit!)
-      self.aliases = %w(c i r l t d e ue g a ch h q qq)
+      self.commands = %w(character inventory rest look take use drop equip unequip go attack change help quit quit!)
+      self.aliases = %w(c i r l t u d e ue g a ch h q qq)
       self.extras = %w(exit exit! x x)
       self.cmd_descriptions = [
         'Display character information',
@@ -62,6 +65,7 @@ module Gemwarrior
         'Take a load off and regain HP',
         'Look around your current location',
         'Take item',
+        'Use item (in inventory or environment)',
         'Drop item',
         'Equip item',
         'Unequip item',
@@ -183,6 +187,60 @@ module Gemwarrior
         else
           world.player.inventory.add_item(world.location_by_coords(world.player.cur_coords), param1)
         end
+      when 'use', 'u'
+        if param1.nil?
+          ERROR_USE_PARAM_MISSING
+        else
+          item_name = param1
+          result = nil
+          location_inventory = world.location_by_coords(world.player.cur_coords).items
+
+          if location_inventory.map(&:name).include?(item_name)
+            location_inventory.each do |i|
+              if i.name.eql?(item_name)
+                if i.useable
+                  result = i.use
+                else
+                  return ERROR_USE_PARAM_UNUSEABLE
+                end
+              end
+            end
+          elsif
+            player_inventory = world.player.inventory.items
+            if player_inventory.map(&:name).include?(item_name)
+              player_inventory.each do |i|
+                if i.name.eql?(item_name)
+                  if i.useable
+                    result = i.use
+                  else
+                    return ERROR_USE_PARAM_UNUSEABLE
+                  end
+                end
+              end
+            end
+          end
+          
+          if result.nil?
+            ERROR_USE_PARAM_INVALID
+          else
+            case result[:type]
+            when 'move'
+              world.player.cur_coords = world.location_coords_by_name(result[:data])
+              world.describe(world.location_by_coords(world.player.cur_coords))
+            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
+              return
+            else
+              return
+            end
+          end
+        end
       when 'drop', 'd'
         if param1.nil?
           ERROR_DROP_PARAM_MISSING

data/lib/gemwarrior/misc/version.rb

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

data/lib/gemwarrior/world.rb

@@ -184,18 +184,12 @@ module Gemwarrior
     private
     
     def init_monsters
-      require_relative 'entities/monsters/alexandrat'
-      require_relative 'entities/monsters/amberoo'
-      require_relative 'entities/monsters/amethystle'
-      require_relative 'entities/monsters/apatiger'
-      require_relative 'entities/monsters/aquamarine'
-      require_relative 'entities/monsters/bloodstorm'
-      require_relative 'entities/monsters/citrinaga'
-      require_relative 'entities/monsters/coraliz'
-      require_relative 'entities/monsters/cubicat'
-      require_relative 'entities/monsters/diaman'
-      require_relative 'entities/monsters/bosses/emerald'
-      require_relative 'entities/monsters/bosses/garynetty'
+      Dir.glob('lib/gemwarrior/entities/monsters/*.rb').each do |item|
+        require_relative item[item.index('/', item.index('/')+1)+1..item.length]
+      end
+      Dir.glob('lib/gemwarrior/entities/monsters/bosses/*.rb').each do |item|
+        require_relative item[item.index('/', item.index('/')+1)+1..item.length]
+      end
       
       self.monsters = [
         Alexandrat.new, 
@@ -214,165 +208,263 @@ module Gemwarrior
     end
 
     def init_locations
-      require_relative 'entities/items/bed'
-      require_relative 'entities/items/feather'
-      require_relative 'entities/items/gun'
-      require_relative 'entities/items/stalactite'
-      require_relative 'entities/items/stonemite'
-      require_relative 'entities/items/stone'
-      require_relative 'entities/items/throne'
-      require_relative 'entities/items/tree'
+      Dir.glob('lib/gemwarrior/entities/items/*.rb').each do |item|
+        require_relative item[item.index('/', item.index('/')+1)+1..item.length]
+      end
       
       locations = []
 
       locations.push(Location.new({
-          :name               => 'Home', 
-          :description        => 'The little, unimportant, decrepit hut that you live in.', 
-          :coords             => {:x => 5, :y => 0},
-          :locs_connected     => {:north => true, :east => true, :south => false, :west => true},
-          :danger_level       => :none,
-          :items              => [Bed.new, Stone.new],
-          :bosses_abounding   => []
+          :name                 => 'Home', 
+          :description          => 'The little, unimportant, decrepit hut that you live in.', 
+          :coords               => {:x => 5, :y => 0},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level         => :none,
+          :monster_level_range  => nil,
+          :items                => [Bed.new, Stone.new],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Cave (Entrance)', 
+          :description          => 'A nearby, dank entrance to a cavern, surely filled with stacktites, stonemites, and rocksites.',
+          :coords               => {:x => 6, :y => 0},
+          :locs_connected       => {:north => false, :east => true, :south => false, :west => true},
+          :danger_level         => :low,
+          :monster_level_range  => 1..2,
+          :items                => [],
+          :bosses_abounding     => []
+        })
+      )
+      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.',
+          :coords               => {:x => 7, :y => 0},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 2..3,
+          :items                => [Stalactite.new, Stonemite.new],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Cave (Nook)', 
+          :description          => 'A depression in the cave wall casts a shadow over a small rock shelf.',
+          :coords               => {:x => 7, :y => 1},
+          :locs_connected       => {:north => false, :east => true, :south => true, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 2..3,
+          :items                => [],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Cave (Dropoff)', 
+          :description          => 'Caves do not usually feature sudden chasms spilling down into an unknowable void, but this one does.',
+          :coords               => {:x => 8, :y => 1},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 2..4,
+          :items                => [],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Cave (Causeway)', 
+          :description          => 'Paths lead north and west, but nothing of interest is in this causeway.',
+          :coords               => {:x => 8, :y => 0},
+          :locs_connected       => {:north => true, :east => false, :south => false, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 2..3,
+          :items                => [],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Forest', 
+          :description          => 'Trees exist here, in droves.',
+          :coords               => {:x => 4, :y => 0},
+          :locs_connected       => {:north => false, :east => true, :south => false, :west => true},
+          :danger_level         => :low,
+          :monster_level_range  => 1..3,
+          :items                => [Feather.new, Tree.new],
+          :bosses_abounding     => []
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Pain Desert (Southeast)', 
+          :description          => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords               => {:x => 3, :y => 0},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level         => :assured,
+          :monster_level_range  => 5..20,
+          :items                => [],
+          :bosses_abounding     => [Garynetty.new]
+        })
+      )
+      locations.push(Location.new({
+          :name                 => 'Pain Desert (Northeast)', 
+          :description          => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords               => {:x => 3, :y => 1},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => true},
+          :danger_level         => :assured,
+          :monster_level_range  => 5..20,
+          :items                => [],
+          :bosses_abounding     => [Garynetty.new]
         })
       )
       locations.push(Location.new({
-          :name               => 'Cave (Entrance)', 
-          :description        => 'A nearby, dank entrance to a cavern, surely filled with stacktites, stonemites, and rocksites.',
-          :coords             => {:x => 6, :y => 0},
-          :locs_connected     => {:north => false, :east => true, :south => false, :west => true},
-          :danger_level       => :low,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Pain Desert (Northwest)', 
+          :description          => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords               => {:x => 2, :y => 1},
+          :locs_connected       => {:north => false, :east => true, :south => true, :west => false},
+          :danger_level         => :assured,
+          :monster_level_range  => 5..20,
+          :items                => [],
+          :bosses_abounding     => [Garynetty.new]
         })
       )
       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.',
-          :coords             => {:x => 7, :y => 0},
-          :locs_connected     => {:north => true, :east => true, :south => false, :west => true},
-          :danger_level       => :moderate,
-          :items              => [Stalactite.new, Stonemite.new],
-          :bosses_abounding   => []
+          :name                 => 'Pain Desert (Southwest)', 
+          :description          => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords               => {:x => 2, :y => 0},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => false},
+          :danger_level         => :assured,
+          :monster_level_range  => 5..20,
+          :items                => [],
+          :bosses_abounding     => [Garynetty.new]
         })
       )
       locations.push(Location.new({
-          :name               => 'Cave (Nook)', 
-          :description        => 'A depression in the cave wall casts a shadow over a small rock shelf.',
-          :coords             => {:x => 7, :y => 1},
-          :locs_connected     => {:north => false, :east => true, :south => true, :west => false},
-          :danger_level       => :moderate,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Plains', 
+          :description          => 'A lot of grass and nothing, but you see a mysterious tower further north, and your home to the south.',
+          :coords               => {:x => 5, :y => 1},
+          :locs_connected       => {:north => true, :east => false, :south => true, :west => false},
+          :danger_level         => :low,
+          :monster_level_range  => 2..3,
+          :items                => [],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Cave (Dropoff)', 
-          :description        => 'Caves do not usually feature sudden chasms spilling down into an unknowable void, but this one does.',
-          :coords             => {:x => 8, :y => 1},
-          :locs_connected     => {:north => false, :east => false, :south => true, :west => true},
-          :danger_level       => :moderate,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (Entrance)', 
+          :description          => 'The craziest guy that ever existed is inside the towering structure  before you.',
+          :coords               => {:x => 5, :y => 2},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Gun.new, TowerSwitch.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Cave (Causeway)', 
-          :description        => 'Paths lead north and west, but nothing of interest is in this causeway.',
-          :coords             => {:x => 8, :y => 0},
-          :locs_connected     => {:north => true, :east => false, :south => false, :west => true},
-          :danger_level       => :moderate,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (Foyer)', 
+          :description          => 'You feel unsettled as you gaze upon the wondrous proportions of Emerald\'s home.',
+          :coords               => {:x => 5, :y => 4},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [FloorTile.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Forest', 
-          :description        => 'Trees exist here, in droves.',
-          :coords             => {:x => 4, :y => 0},
-          :locs_connected     => {:north => false, :east => true, :south => false, :west => true},
-          :danger_level       => :low,
-          :items              => [Feather.new, Tree.new],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (Cloud Garden)', 
+          :description          => 'A perfectly-maintained array of wispy flowers and other ethereal plantlife contained within a cumulonimbus barrier.',
+          :coords               => {:x => 5, :y => 5},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Flower.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Pain Desert (Southeast)', 
-          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
-          :coords             => {:x => 3, :y => 0},
-          :locs_connected     => {:north => true, :east => true, :south => false, :west => true},
-          :danger_level       => :assured,
-          :items              => [],
-          :bosses_abounding   => [Garynetty.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.',
+          :coords               => {:x => 4, :y => 4},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Dehumidifier.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Pain Desert (Northeast)', 
-          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
-          :coords             => {:x => 3, :y => 1},
-          :locs_connected     => {:north => false, :east => false, :south => true, :west => true},
-          :danger_level       => :assured,
-          :items              => [],
-          :bosses_abounding   => [Garynetty.new]
+          :name                 => 'Sky Tower (West Hallway)', 
+          :description          => 'The hallway seems to stretch on for days.',
+          :coords               => {:x => 4, :y => 5},
+          :locs_connected       => {:north => true, :east => false, :south => true, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Flower.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Pain Desert (Northwest)', 
-          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
-          :coords             => {:x => 2, :y => 1},
-          :locs_connected     => {:north => false, :east => true, :south => true, :west => false},
-          :danger_level       => :assured,
-          :items              => [],
-          :bosses_abounding   => [Garynetty.new]
+          :name                 => 'Sky Tower (Waterfalls)', 
+          :description          => 'The seemingly neverending deluge of water causes this room to be quite loud, yet pretty.',
+          :coords               => {:x => 4, :y => 6},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Waterfall.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Pain Desert (Southwest)', 
-          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
-          :coords             => {:x => 2, :y => 0},
-          :locs_connected     => {:north => true, :east => true, :south => false, :west => false},
-          :danger_level       => :assured,
-          :items              => [],
-          :bosses_abounding   => [Garynetty.new]
+          :name                 => 'Sky Tower (Massive Door)', 
+          :description          => 'Before you lies a massive collection of cumulus clouds that form into a door, beyond which may well be your doom.',
+          :coords               => {:x => 5, :y => 6},
+          :locs_connected       => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 4..5,
+          :items                => [MassiveDoor.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Plains', 
-          :description        => 'A lot of grass and nothing, but you see a mysterious tower further north, and your home to the south.',
-          :coords             => {:x => 5, :y => 1},
-          :locs_connected     => {:north => true, :east => false, :south => true, :west => false},
-          :danger_level       => :low,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (Throne Room)', 
+          :description          => 'There, on a mighty seat made of broken dreams, sits Emerald himself, staring at you coldly, silently.',
+          :coords               => {:x => 5, :y => 7},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => false},
+          :danger_level         => :high,
+          :monster_level_range  => 5..7,
+          :items                => [Throne.new],
+          :bosses_abounding     => [Emerald.new]
         })
       )
       locations.push(Location.new({
-          :name               => 'Sky Tower (Entrance)', 
-          :description        => 'The craziest guy that ever existed is inside the towering structure of cloud floors and snow walls standing before you.',
-          :coords             => {:x => 5, :y => 2},
-          :locs_connected     => {:north => true, :east => false, :south => true, :west => false},
-          :danger_level       => :high,
-          :items              => [Gun.new],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (Lounge)', 
+          :description          => 'Nothing but a simple couch, which looks very comfortable, exists in this corner of the tower.',
+          :coords               => {:x => 6, :y => 6},
+          :locs_connected       => {:north => false, :east => false, :south => true, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Couch.new],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Sky Tower (Foyer)', 
-          :description        => 'There appears to be one path forward, towards the throne room.',
-          :coords             => {:x => 5, :y => 3},
-          :locs_connected     => {:north => true, :east => false, :south => true, :west => false},
-          :danger_level       => :high,
-          :items              => [],
-          :bosses_abounding   => []
+          :name                 => 'Sky Tower (East Hallway)', 
+          :description          => 'Longish and neverending is what you might say about this stretch of the tower.',
+          :coords               => {:x => 6, :y => 5},
+          :locs_connected       => {:north => true, :east => false, :south => true, :west => false},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [],
+          :bosses_abounding     => []
         })
       )
       locations.push(Location.new({
-          :name               => 'Sky Tower (Throne Room)', 
-          :description        => 'There, on a mighty seat made of broken dreams, sits Emerald himself, staring at you coldly, silently.',
-          :coords             => {:x => 5, :y => 4},
-          :locs_connected     => {:north => false, :east => false, :south => true, :west => false},
-          :danger_level       => :high,
-          :items              => [Throne.new],
-          :bosses_abounding   => [Emerald.new]
+          :name                 => 'Sky Tower (Kitchen)', 
+          :description          => 'This kitchen looks well-used, as appliances abound, and leftover food sits atop counters.',
+          :coords               => {:x => 6, :y => 4},
+          :locs_connected       => {:north => true, :east => false, :south => false, :west => true},
+          :danger_level         => :moderate,
+          :monster_level_range  => 3..4,
+          :items                => [Apple.new, Cup.new],
+          :bosses_abounding     => []
         })
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Chadwick
@@ -177,15 +177,24 @@ files:
 - lib/gemwarrior/entities/creature.rb
 - lib/gemwarrior/entities/entity.rb
 - lib/gemwarrior/entities/item.rb
+- lib/gemwarrior/entities/items/apple.rb
 - lib/gemwarrior/entities/items/bed.rb
+- lib/gemwarrior/entities/items/couch.rb
+- lib/gemwarrior/entities/items/cup.rb
+- lib/gemwarrior/entities/items/dehumidifier.rb
 - lib/gemwarrior/entities/items/feather.rb
+- lib/gemwarrior/entities/items/floor_tile.rb
+- lib/gemwarrior/entities/items/flower.rb
 - lib/gemwarrior/entities/items/gun.rb
+- lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/sparklything.rb
 - lib/gemwarrior/entities/items/stalactite.rb
 - lib/gemwarrior/entities/items/stone.rb
 - lib/gemwarrior/entities/items/stonemite.rb
 - lib/gemwarrior/entities/items/throne.rb
+- lib/gemwarrior/entities/items/tower_switch.rb
 - lib/gemwarrior/entities/items/tree.rb
+- lib/gemwarrior/entities/items/waterfall.rb
 - lib/gemwarrior/entities/location.rb
 - lib/gemwarrior/entities/monster.rb
 - lib/gemwarrior/entities/monsters/alexandrat.rb