gemwarrior 0.10.8 → 0.11.0

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/pond.rb
-# Item::Pond
+# Entity::Item::Pond
 
 require_relative '../item'
 
@@ -12,18 +12,14 @@ module Gemwarrior
       super
 
       self.name         = 'pond'
+      self.name_display = 'Pond'
       self.description  = 'This tiny pool of water self-ripples every minute or so. Small, floating insects buzz around merrily. A small plaque lays at the foot, reading: "If the right objects curious doth possess, touch the water\'s surface and you\'ll get redress."'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'You gently place your fingers on the pond\'s rippling surface.'
 
-      if (NEEDED_ITEMS - player.inventory.items.map(&:name)).empty?
+      if (NEEDED_ITEMS - world.player.inventory.items.map(&:name)).empty?
         puts 'The pond water explodes with a force that knocks you back onto the ground. When you come to, you notice the depression in the ground where the pond once was now has a new curious object!'
         self.description = 'A barren depression in the ground is all that is left of the pond.'
         return { type: 'item', data: 'Opalaser' }

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/rope.rb
-# Item::Rope
+# Entity::Item::Rope
 
 require_relative '../item'
 
@@ -9,15 +9,11 @@ module Gemwarrior
       super
 
       self.name         = 'rope'
+      self.name_display = 'Rope'
       self.description  = 'For some reason, a sturdy rope hangs down from a small opening in the metal tunnel\'s ceiling. It appears to hold your weight when taut.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'You hold on to the rope with both hands and begin to climb upwards towards the small opening in the ceiling.'
       puts
 
@@ -25,7 +21,7 @@ module Gemwarrior
       puts
       
       # stats
-      player.movements_made += 1
+      world.player.movements_made += 1
 
       { type: 'move', data: 'Snow Fields (Southeast)' }
     end

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

@@ -1,95 +1,33 @@
 # lib/gemwarrior/entities/items/small_hole.rb
-# Item::SmallHole
+# Entity::Item::SmallHole
 
-require_relative '../item'
-require_relative 'herb'
-require_relative 'dagger'
+require_relative '../person'
 
 module Gemwarrior
   class SmallHole < Item
-    # CONSTANTS
-    PRICE_HERB              = 10
-    PRICE_DAGGER            = 150
-    PLAYER_ROX_INSUFFICIENT = '>> "Pity. You are a bit short on funds to purchase that item."'
-    PLAYER_ITEMS_ADDITIONAL = '>> "Anything else?"'
-    PLAYER_COMMAND_INVALID  = '>> "Huh?"'
-
     def initialize
       super
 
       self.name         = 'small_hole'
+      self.name_display = 'Small Hole'
       self.description  = 'Amongst the rubble of the alcove, a small hole, barely big enough for a rodent, exists in an absently-minded way near the bottom of the wall.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
-    end
-    
-    def use(player = nil)
-      puts 'You lower yourself to the ground and attempt to peer in the hole in the wall. Just as you begin to think this is a fruitless endeavor, a pair of bright, beady eyes manifest, and an unexpectedly low voice begins speaking to you:'
-      puts
-
-      rat_shop(player)
-    end
-
-    def reuse(player = nil)
-      rat_shop(player)
     end
 
-    def rat_shop(player)
-      items_purchased = []
-
-      puts '>> "Hello, wanderer. Welcome to my establishment, as it were. Are you in need of anything?"'
-      puts
-      puts 'The creature gently shoves a small slip of paper out of his hole and towards you. You take a peek and notice it has a list of things with prices on it.'
-      puts
-      puts 'Rockney\'s Hole in the Wall'
-      puts '--------------------------'
-      puts "(1) Herb     - #{PRICE_HERB}  rox"
-      puts "(2) Dagger   - #{PRICE_DAGGER} rox"
-      puts
-      puts '>> "What are you in need of?"'
+    def use(world)
+      if !self.used
+        self.used = true
 
-      loop do
-        puts ' 1 - Herb'
-        puts ' 2 - Dagger'
-        puts ' x - leave'
-        print '[ROCKNEY]>? '
+        puts 'You lower yourself to the ground and attempt to peer in the hole in the wall. Just as you begin to think this is a fruitless endeavor, a pair of bright, beady eyes manifest, and an unexpectedly low voice speaks:'
+        Person.new.speak('Hello. I\'m Rockney, of Rockney\'s Hole in the Wall. Pleasure!')
 
-        choice = gets.chomp!
-
-        case choice
-        when '1'
-          if player.rox >= 10
-            player.rox -= 10
-            items_purchased.push(Herb.new)
-            puts '>> "Excellent choice."'
-            puts PLAYER_ITEMS_ADDITIONAL
-            next
-          else
-            puts PLAYER_ROX_INSUFFICIENT
-            next
-          end
-        when '2'
-          if player.rox >= 150
-            player.rox -= 150
-            items_purchased.push(Dagger.new)
-            puts '>> "A fine blade, indeed."'
-            puts PLAYER_ITEMS_ADDITIONAL
-            next
-          else
-            puts PLAYER_ROX_INSUFFICIENT
-            next
-          end
-        when 'x'
-          puts '>> "If you need anything further, I\'m always in this hole..."'
-          return { type: 'purchase', data: items_purchased }
-        else
-          puts PLAYER_COMMAND_INVALID
-          next
-        end
+        tunnel_alcove = world.location_by_name('tunnel_alcove')
+        tunnel_alcove.items.push(Rockney.new)
+        puts world.describe(tunnel_alcove)
+      else
+        puts 'Rockney appears to still be in the small hole, patiently waiting for you.'
       end
+
+      { type: nil, data: nil }
     end
   end
 end

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

@@ -1,30 +1,26 @@
 # lib/gemwarrior/entities/items/snowman.rb
-# Item::Snowman
+# Entity::Item::Snowman
 
 require_relative '../item'
 
 module Gemwarrior
   class Snowman < Item
     # CONSTANTS
-    USE_TEXT = '*** FOOOOSH ***'
+    USE_TEXT = '** FOOOOSH **'
 
     def initialize
       super
 
       self.name         = 'snowman'
+      self.name_display = 'Snowman'
       self.description  = 'Standing solemnly in the snow, a man of snow solemnly stands.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'You go to touch the snowy softness of the snowman when it magically comes to life! The frozen homunculus grabs you by the wrist and tosses you to the ground, only to follow this up by jumping onto you with its full, freezing, force. Your body, and mind, go numb.'
       puts
 
-      Animation::run(phrase: USE_TEXT)
+      Animation.run(phrase: USE_TEXT)
 
       { type: 'move_dangerous', data: 'Home' }
     end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/sparklything.rb
-# Item::SparklyThing
+# Entity::Item::SparklyThing
 
 require_relative '../item'
 
@@ -9,17 +9,13 @@ module Gemwarrior
       super
 
       self.name         = 'sparkly_thing'
+      self.name_display = 'SparklyThing(tm)'
       self.description  = 'The sparkling that this thing does is unimaginably brilliant.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
       self.takeable     = true
-      self.useable      = true
-      self.equippable   = false
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'Everything, and I mean *everything*, begins to sparkle. Huh.'
-      puts
       { type: nil, data: nil }
     end
   end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/stonemite.rb
-# Item::Stonemite
+# Entity::Item::Stonemite
 
 require_relative '../item'
 
@@ -9,13 +9,9 @@ module Gemwarrior
       super
 
       self.name         = 'stonemite'
+      self.name_display = 'Stonemite'
       self.description  = 'Stubby cave debris that is neat to look at, as it is off-grey and sparkly, but the size makes it unusable as anything but skipping on a lake.'
-      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/tent.rb

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/tent.rb
-# Item::Tent
+# Entity::Item::Tent
 
 require_relative '../item'
 
@@ -9,16 +9,13 @@ module Gemwarrior
       super
 
       self.name           = 'tent'
+      self.name_display   = 'Tent'
       self.description    = 'A magical, two-room suite pops up when you flick this otherwise folded piece of canvas just right, perfect for a night\'s rest.'
-      self.atk_lo         = nil
-      self.atk_hi         = nil
       self.takeable       = true
-      self.useable        = true
-      self.equippable     = false
       self.number_of_uses = 5
     end
 
-    def use(player = nil)
+    def use(world)
       { type: 'tent', data: self.number_of_uses }
     end
   end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/throne.rb
-# Item::Throne
+# Entity::Item::Throne
 
 require_relative '../item'
 
@@ -9,12 +9,13 @@ module Gemwarrior
       super
 
       self.name         = 'throne'
+      self.name_display = 'Throne'
       self.description  = 'Made of what appears to be unfulfilled desires and latent, flawed happiness, the well-crafted seat still looks kinda comfy. The wizard Emerald sits in it, glaring at you.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = false
-      self.equippable   = false
+    end
+    
+    def use
+      puts 'Your words fall on deaf chairs. Emerald continues to stare at you.'
+      { type: nil, data: nil }
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/tree.rb
-# Item::Tree
+# Entity::Item::Tree
 
 require_relative '../item'
 
@@ -9,12 +9,8 @@ module Gemwarrior
       super
 
       self.name         = 'tree'
+      self.name_display = 'Tree'
       self.description  = 'A mighty representation of nature, older than your father\'s father\'s second great-uncle.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = false
-      self.equippable   = false
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/waterfall.rb
-# Item::Waterfall
+# Entity::Item::Waterfall
 
 require_relative '../item'
 
@@ -9,17 +9,18 @@ module Gemwarrior
       super
 
       self.name         = 'waterfall'
+      self.name_display = '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
     end
 
-    def use(player = nil)
+    def use(world)
       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.'
-      { type: 'dmg', data: rand(0..1) }
+      
+      dmg = rand(0..1)
+      
+      puts '>> You lose a hit point.'.colorize(:red) if dmg > 0
+      
+      { type: 'dmg', data: dmg }
     end
   end
 end

data/lib/gemwarrior/entities/location.rb

@@ -1,4 +1,5 @@
 # lib/gemwarrior/entities/location.rb
+# Entity::Location
 # Place in the game
 
 require_relative 'entity'
@@ -8,10 +9,36 @@ module Gemwarrior
   class Location < Entity
     # CONSTANTS
     DANGER_LEVEL              = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
+    ERROR_ITEM_ADD_INVALID    = 'That item cannot be added to the location\'s inventory.'
     ERROR_ITEM_REMOVE_INVALID = 'That item cannot be removed as it does not exist here.'
 
-    attr_accessor :coords, :locs_connected, :danger_level, :monster_level_range, :items, 
-                  :monsters_abounding, :bosses_abounding, :checked_for_monsters
+    attr_accessor :coords,
+                  :locs_connected,
+                  :danger_level,
+                  :monster_level_range,
+                  :items,
+                  :monsters_abounding,
+                  :bosses_abounding,
+                  :checked_for_monsters
+
+    def describe
+      desc_text =  name.ljust(30).upcase.colorize(:green)
+      desc_text << coords.values.to_a.to_s.colorize(:white)
+      desc_text << " DL[#{danger_level.to_s.ljust(8)}] ".colorize(:white) if GameOptions.data['debug_mode']
+      desc_text << " MLR[#{monster_level_range.to_s.ljust(6)}] ".colorize(:white) if GameOptions.data['debug_mode']
+      desc_text << "\n"
+      desc_text << "#{description}".colorize(:white)
+      desc_text
+    end
+
+    def describe_detailed
+      desc_text =  "#{name_display.ljust(36).colorize(:yellow)} #{coords.values.to_a.to_s.colorize(:white)}\n"
+      desc_text << "(#{name})\n".colorize(:green)
+      desc_text << "#{description}\n".colorize(:white)
+      desc_text << "DANGER_LEVEL       : #{danger_level}\n".colorize(:white)
+      desc_text << "MONSTER_LEVEL_RANGE: #{monster_level_range}\n".colorize(:white)
+      desc_text
+    end
 
     def initialize(options)
       self.name                 = options.fetch(:name)
@@ -21,41 +48,36 @@ module Gemwarrior
       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]
+      self.monsters_abounding   = options.fetch(:monsters_abounding)
+      self.bosses_abounding     = options.fetch[:bosses_abounding]
       self.checked_for_monsters = false
     end
 
-    def status
-      status_text =  name.ljust(30).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 GameOptions.data['debug_mode']
-      status_text << " MLR[#{monster_level_range.to_s.ljust(6)}] ".colorize(:white) if GameOptions.data['debug_mode']
-      status_text << "\n#{description}\n".colorize(:white)
-    end
-
-    def has_item?(item_name)
-      items.map{|i| i.name.downcase}.include?(item_name)
+    def contains_item?(item_name)
+      self.items.map{|i| i.name.downcase}.include?(item_name.downcase)
     end
 
     def has_monster?(monster_name)
-      monsters_abounding.map{|m| m.name.downcase}.include?(monster_name)
+      monsters_abounding.map{|m| m.name.downcase}.include?(monster_name.downcase)
     end
 
     def has_boss?(boss_name)
-      bosses_abounding.map{|b| b.name.downcase}.include?(boss_name)
+      bosses_abounding.map{|b| b.name.downcase}.include?(boss_name.downcase)
     end
 
-    def add_item(item_name)
-      Dir.glob('lib/gemwarrior/items/*.rb').each do |item|
-        require_relative item[item.index('/', item.index('/')+1)+1..item.length]
+    def add_item(item_name_to_add)
+      all_items = GameItems.data || GameWeapons.data
+      all_items.each do |game_item|
+        if game_item.name.eql?(item_name_to_add)
+          self.items.push(game_item)
+          return
+        end
       end
-
-      self.items.push(eval(item_name).new)
+      return LOCATION_INVENTORY_ADD_ITEM_INVALID
     end
 
     def remove_item(item_name)
-      if has_item?(item_name)
+      if contains_item?(item_name)
         items.reject! { |item| item.name == item_name }
       else
         ERROR_ITEM_REMOVE_INVALID
@@ -64,7 +86,7 @@ module Gemwarrior
 
     def remove_monster(name)
       monsters_abounding.reject! { |monster| monster.name == name }
-      bosses_abounding.reject! { |monster| monster.name == name }
+      bosses_abounding.reject! { |boss| boss.name == name }
     end
 
     def has_loc_to_the?(direction)
@@ -102,10 +124,6 @@ module Gemwarrior
         trigger_values = 0..max
         actual_value = rand(1..100)
 
-        if GameOptions.data['debug_mode']
-          puts "should_spawn_monster? #{trigger_values} : #{actual_value}"
-        end
-
         if trigger_values.include?(actual_value)
           found = true
         end
@@ -114,27 +132,15 @@ module Gemwarrior
     end
 
     def list_items
-      if items.length > 0
-        items.map(&:name)
-      else
-        []
-      end
+      items.length > 0 ? items.map(&:name) : []
     end
 
     def list_monsters
-      if monsters_abounding.length > 0
-        monsters_abounding.map(&:name)
-      else
-        []
-      end
+      monsters_abounding.length > 0 ? monsters_abounding.map(&:name) : []
     end
 
     def list_bosses
-      if bosses_abounding.length > 0
-        bosses_abounding.map(&:name)
-      else
-        []
-      end
+      bosses_abounding.length > 0 ? bosses_abounding.map(&:name_display) : []
     end
 
     def list_paths
@@ -148,7 +154,7 @@ module Gemwarrior
     end
 
     def list_actionable_words
-      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?