gemwarrior 0.10.8 → 0.11.0

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/bullet.rb
+# Entity::Item::Bullet
+
+require_relative '../item'
+
+module Gemwarrior
+  class Bullet < Item
+    # CONSTANTS
+    USE_TEXT = '** ZZZZZ **'
+
+    def initialize
+      super
+
+      self.name         = 'bullet'
+      self.name_display = 'Bullet'
+      self.description  = 'Gunpowder packed into a small metallic tube, ready to be fired from...something.'
+      self.takeable     = true
+    end
+
+    def use(world)
+      puts 'You could throw this at a monster, but somehow the force of it would be less than desired.'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/couch.rb
-# Item::Couch
+# Entity::Item::Couch
 
 require_relative '../item'
 
@@ -9,22 +9,18 @@ module Gemwarrior
       super
 
       self.name         = 'couch'
+      self.name_display = '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
     end
 
-    def use(player = nil)
-      if player.at_full_hp?
+    def use(world)
+      if world.player.at_full_hp?
         puts 'You "sit" on the impossibly soft surface of the furniture, but even after a few minutes of this seemingly heavenly hedonism you don\'t feel significantly better and decide to get up again.'
         { type: nil, data: nil }
       else
         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 }
+        puts '>> You regain a few hit points.'.colorize(:green)
+        { type: 'rest', data: 4 }
       end
     end
   end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/cup.rb
-# Item::Cup
+# Entity::Item::Cup
 
 require_relative '../item'
 
@@ -9,12 +9,9 @@ module Gemwarrior
       super
 
       self.name         = 'cup'
+      self.name_display = '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
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/dehumidifier.rb
-# Item::Dehumidifier
+# Entity::Item::Dehumidifier
 
 require_relative '../item'
 
@@ -9,12 +9,9 @@ module Gemwarrior
       super
 
       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.name_display = 'Dehumidifier'
+      self.description  = 'Humidity stands approximately zero chance when its presence.'
       self.takeable     = true
-      self.useable      = false
-      self.equippable   = true
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/feather.rb
-# Item::Feather
+# Entity::Item::Feather
 
 require_relative '../item'
 
@@ -9,12 +9,9 @@ module Gemwarrior
       super
 
       self.name         = 'feather'
+      self.name_display = 'Feather'
       self.description  = 'A blue and green feather. It is soft and tender, unlike the craven bird that probably shed it.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
       self.takeable     = true
-      self.useable      = false
-      self.equippable   = false
     end
   end
 end

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

@@ -1,33 +1,29 @@
 # lib/gemwarrior/entities/items/floor_tile.rb
-# Item::FloorTile
+# Entity::Item::FloorTile
 
 require_relative '../item'
 
 module Gemwarrior
   class FloorTile < Item
     # CONSTANTS
-    MOVE_TEXT = '*** SHOOOOOM ***'
+    MOVE_TEXT = '** SHOOOOOM **'
 
     def initialize
       super
 
       self.name         = 'floor_tile'
+      self.name_display = '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
     end
 
-    def use(player = nil)
+    def use(world)
       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
 
       # stats
-      player.movements_made += 1
+      world.player.movements_made += 1
 
-      Animation::run(phrase: MOVE_TEXT)
+      Animation.run(phrase: MOVE_TEXT)
 
       { type: 'move', data: 'Rock Piles' }
     end

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

@@ -9,12 +9,9 @@ module Gemwarrior
       super
 
       self.name         = 'flower'
+      self.name_display = '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
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/herb.rb
-# Item::Herb
+# Entity::Item::Herb
 
 require_relative '../item'
 
@@ -8,24 +8,23 @@ module Gemwarrior
     def initialize
       super
 
-      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.consumable   = true
-      self.equippable   = false
+      self.name           = 'herb'
+      self.name_display   = 'Herb'
+      self.description    = 'Green and leafy, this wild herb looks edible.'
+      self.takeable       = true
+      self.consumable     = true
+      self.useable_battle = true
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'You place the entire, smallish plant 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.'
-      if player.at_full_hp?
+      if world.player.at_full_hp?
         puts '>> The herb has no medicinal effect, as you already feel perfectly healthy, but it was kind of tasty.'
         { type: nil, data: nil }
       else
-        puts '>> You regain a few hit points.'
-        { type: 'health', data: rand(3..5) }
+        hp_healed = rand(3..5)
+        puts ">> You regain #{hp_healed} hit points.".colorize(:green)
+        { type: 'health', data: hp_healed }
       end
     end
   end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/keystone.rb
-# Item::Keystone
+# Entity::Item::Keystone
 
 require_relative '../item'
 
@@ -9,12 +9,9 @@ module Gemwarrior
       super
 
       self.name         = 'keystone'
+      self.name_display = 'Keystone'
       self.description  = 'Certainly greater than the sum of its parts, this smallish stone glows faintly and feels slick to the touch.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
       self.takeable     = true
-      self.useable      = false
-      self.equippable   = false
     end
   end
 end

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

@@ -1,38 +1,34 @@
 # lib/gemwarrior/entities/items/ladder.rb
-# Item::Ladder
+# Entity::Item::Ladder
 
 require_relative '../item'
 
 module Gemwarrior
   class Ladder < Item
     # CONSTANTS
-    USE_TEXT = '*** THUMP ***'
+    USE_TEXT = '** THUMP **'
 
     def initialize
       super
 
       self.name         = 'ladder'
+      self.name_display = 'Ladder'
       self.description  = 'Rickety and crudely-fashioned, this ladder descends down into the dropoff, hopefully heading towards something...anything.'
-      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 grab onto the shaky, rough-hewn, wooden ladder with all your might and start to descend, being extra careful not to loose your grip, which with every moment becomes shakier and shakier.'
       puts
 
       # stats
-      player.movements_made += 1
+      world.player.movements_made += 1
 
-      Animation::run(phrase: USE_TEXT)
+      Animation.run(phrase: USE_TEXT)
 
       puts 'The last couple of steps are more slippery than you anticipated, so you end up fumbling them, falling a few feet onto the hard ground below. When you regain your composure, you notice your conveyance for descending is now far above you and it is, unfortunately, your closest known exit.'
       puts
 
-      { type: 'move_dangerous', data: 'Metal Tunnel (South Entrance)' }
+      { type: 'move_dangerous', data: 'metal_tunnel-south_entrance' }
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/letter.rb
-# Item::Letter
+# Entity::Item::Letter
 
 require_relative '../item'
 
@@ -9,15 +9,12 @@ module Gemwarrior
       super
 
       self.name         = 'letter'
+      self.name_display = 'Letter'
       self.description  = 'A single page of thin paper, folded at the middle, with some excellent penmanship impressed upon it.'
-      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)
       if self.used
         print 'Do you want to read the letter again? (y/n) '
         answer = gets.chomp.downcase
@@ -41,28 +38,28 @@ module Gemwarrior
     def print_letter(player)
       puts 'The words of the queen echo in your head as you read the royal note sent to you again:'
       puts
-      Animation::run(phrase: "  Dear #{player.name},", speed: :insane)
+      Animation.run(phrase: "  Dear #{world.player.name},", speed: :insane)
       puts
-      Animation::run(phrase: '    Oh, my! Jool is in trouble! The evil wizard/sorceror/conjuror/rocksmith/wily ', speed: :insane)
-      Animation::run(phrase: "    Emerald has absconded with our ShinyThing(tm)! It is vital that you, #{player.name}, ", speed: :insane)
-      Animation::run(phrase: '    go to his tower in the sky in order to retrieve it before he does something', speed: :insane)
-      Animation::run(phrase: '    terrible with it!', speed: :insane)
+      Animation.run(phrase: '    Oh, my! Jool is in trouble! The evil wizard/sorceror/conjuror/rocksmith/wily ', speed: :insane)
+      Animation.run(phrase: "    Emerald has absconded with our ShinyThing(tm)! It is vital that you, #{world.player.name}, ", speed: :insane)
+      Animation.run(phrase: '    go to his tower in the sky in order to retrieve it before he does something', speed: :insane)
+      Animation.run(phrase: '    terrible with it!', speed: :insane)
       puts
-      Animation::run(phrase: '    Remember that one time you came to the castle, trying to sell stones you', speed: :insane)
-      Animation::run(phrase: '    pilfered from a nearby cave? Remember how I laughed and told you to leave', speed: :insane)
-      Animation::run(phrase: '    at once or I\'d have the royal guard take your head off? Ha!', speed: :insane)
+      Animation.run(phrase: '    Remember that one time you came to the castle, trying to sell stones you', speed: :insane)
+      Animation.run(phrase: '    pilfered from a nearby cave? Remember how I laughed and told you to leave', speed: :insane)
+      Animation.run(phrase: '    at once or I\'d have the royal guard take your head off? Ha!', speed: :insane)
       puts
-      Animation::run(phrase: '    What a fool I was to cast such a special person out, as a mysterious stranger', speed: :insane)
-      Animation::run(phrase: "    in the night told me, before mysteriously disappearing, that you, #{player.name},", speed: :insane)
-      Animation::run(phrase: '    are actually the only one who can save us (for some reason, but that\'s', speed: :insane)
-      Animation::run(phrase: '    mysterious strangers for you, right?)!', speed: :insane)
+      Animation.run(phrase: '    What a fool I was to cast such a special person out, as a mysterious stranger', speed: :insane)
+      Animation.run(phrase: "    in the night told me, before mysteriously disappearing, that you, #{world.player.name},", speed: :insane)
+      Animation.run(phrase: '    are actually the only one who can save us (for some reason, but that\'s', speed: :insane)
+      Animation.run(phrase: '    mysterious strangers for you, right?)!', speed: :insane)
       puts
-      Animation::run(phrase: '    Please, I beg of you, save Jool from the potential terror that Emerald could', speed: :insane)
-      Animation::run(phrase: "    possibly wreak on all of us before it is too late! If you do, you, #{player.name},", speed: :insane)
-      Animation::run(phrase: '    will be rewarded handsomely!', speed: :insane)
+      Animation.run(phrase: '    Please, I beg of you, save Jool from the potential terror that Emerald could', speed: :insane)
+      Animation.run(phrase: "    possibly wreak on all of us before it is too late! If you do, you, #{world.player.name},", speed: :insane)
+      Animation.run(phrase: '    will be rewarded handsomely!', speed: :insane)
       puts
-      Animation::run(phrase: '  Sincerely,', speed: :insane);
-      Animation::run(phrase: '  Queen Ruby', speed: :insane);
+      Animation.run(phrase: '  Sincerely,', speed: :insane);
+      Animation.run(phrase: '  Queen Ruby', speed: :insane);
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/map.rb
-# Item::Map
+# Entity::Item::Map
 
 require_relative '../item'
 
@@ -9,15 +9,12 @@ module Gemwarrior
       super
 
       self.name         = 'map'
+      self.name_display = 'Map'
       self.description  = 'The land of Jool is contained on this piece of canvas, in a useful, if not very detailed, manner.'
-      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 'You unfold the piece of worn canvas, and study the markings upon it.'
 
       { type: 'action', data: 'map' }

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

@@ -1,5 +1,5 @@
 # lib/gemwarrior/entities/items/massive_door.rb
-# Item::MassiveDoor
+# Entity::Item::MassiveDoor
 
 require_relative '../item'
 
@@ -9,17 +9,13 @@ module Gemwarrior
       super
 
       self.name         = 'massive_door'
+      self.name_display = 'Massive Door'
       self.description  = 'Translucent, but not transparent, this door constructed of condensed water vapor is like nothing you have ever seen. It has no keyhole, but it does have a stone-shaped depression floating centrally within it.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
     end
 
     def use(player = nil)
       puts 'You attempt to open the seriously massive door that separates you from Emerald himself.'
-      if player.inventory.contains_item?('keystone')
+      if world.player.inventory.contains_item?('keystone')
         puts 'The keystone in your inventory glows as you approach the incredibly titanic-sized door, so you naturally pull it out and thrust it into the stone-shaped depression within the cloudy obstruction. The door "opens" in a way and you can now pass through.'
         { type: 'move', data: 'Sky Tower (Throne Room)' }
       else

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

@@ -1,12 +1,12 @@
 # lib/gemwarrior/entities/items/pedestal.rb
-# Item::Pedestal
+# Entity::Item::Pedestal
 
 require_relative '../item'
 
 module Gemwarrior
   class Pedestal < Item
     # CONSTANTS
-    USE_TEXT = '*** WHOOOOOSH ***'
+    USE_TEXT = '** WHOOOOOSH **'
   
     attr_accessor :switches
 
@@ -14,12 +14,8 @@ module Gemwarrior
       super
 
       self.name         = 'pedestal'
+      self.name_display = 'Pedestal'
       self.description  = 'A pedestal about 4 feet in height rises up from the ground, with six switches arranged vertically above a large gem affixed to the top. The switches each have a word next to them in some language that looks familiar yet strange. Each letter is made of some kind of ink crudely splashed on stone, and each can be moved to arrange them in a different fashion than they are now. The large gem glitters with utter brilliance.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
       self.switches     = init_switches
     end
 
@@ -36,7 +32,7 @@ module Gemwarrior
       self.switches = self.switches.sort_by { rand }
     end
 
-    def use(player = nil)
+    def use(world)
       puts 'You look at the pedestal and its switches. The raised gem beckons you to push it and, deductively, you believe that pressing it will do something. However, those switches probably have something to do with the result.'
       
       loop do
@@ -100,9 +96,9 @@ module Gemwarrior
             puts 'You push the large gem into the pedestal and it descends without a hitch, almost as if it were meant to be. The pedestal begins to violently shake and a strong gust of wind picks you up off the ground. You feel completely taken aback and unsettled, but you have no choice: you are being whisked away somewhere into the sky, destination unknown.'.colorize(:yellow)
             
             # stats
-            player.movements_made += 1
+            world.player.player.movements_made += 1
             
-            Animation::run(phrase: USE_TEXT)
+            Animation.run(phrase: USE_TEXT)
             return { type: 'move', data: 'Sky Tower (Entryway)' }
           else
             puts 'You attempt to push the large gem, but it puts up quite the resistance, and nothing much else happens. Your attention once again returns to the pedestal and its switches.'.colorize(:red)