fixed battle 'slow' bug; changed almost all ruby 1.9 hash syntax to proper 2.0; colorized some more main menu option headers

michaelchadwick · michaelchadwick · commit 2c39df3ce699 · 2015-08-12T09:54:20.000-07:00
diff --git a/lib/gemwarrior/battle.rb b/lib/gemwarrior/battle.rb
@@ -11,7 +11,7 @@ class Battle
     BEAST_MODE_ATTACK           = 100
 
     ## MESSAGES
-    TEXT_ESCAPE                 = 'POOF'
+    ESCAPE_TEXT                 = '** POOF **'
 
     attr_accessor :world, :player, :monster, :player_is_defending
 
@@ -38,7 +38,7 @@ def start(is_arena = nil, is_event = nil)
 
       if is_arena
         print 'Your opponent is now...'
-        Animation::run(phrase: "#{monster.name.upcase}!", speed: slow)
+        Animation::run(phrase: "#{monster.name.upcase}!", speed: :slow)
       elsif is_event
         puts "You are attacked by #{monster.name}!"
       else
@@ -218,7 +218,7 @@ def take_damage(entity, dmg)
       end
 
       print who_gets_wounded
-      Animation::run({ phrase: dmg.to_s, speed: slow, oneline: true, alpha: false, random: false })
+      Animation::run(phrase: dmg.to_s, speed: :slow, oneline: true, alpha: false, random: false)
       print " point(s)!\n"
     end
 
@@ -355,7 +355,7 @@ def player_escape?(is_arena)
     # STATUS TEXT
 
     def print_escape_text
-      Animation::run(phrase: '** POOF **', oneline: true)
+      Animation::run(phrase: ESCAPE_TEXT, oneline: true)
     end
 
     def print_battle_line
diff --git a/lib/gemwarrior/entities/items/arena_master.rb b/lib/gemwarrior/entities/items/arena_master.rb
@@ -21,7 +21,7 @@ def initialize
     end
 
     def use(player = nil)
-      puts "You approach #{ARENA_MASTER_NAME.colorize(:color => :white, :background => :black)}, the Arena Master, and ask to prove your mettle in the arena. She snickers to herself, but sees you have a good spirit about you."
+      puts "You approach #{ARENA_MASTER_NAME.colorize(color: :white, background: :black)}, the Arena Master, and ask to prove your mettle in the arena. She snickers to herself, but sees you have a good spirit about you."
       puts
 
       if player.rox >= 50
@@ -34,15 +34,15 @@ def use(player = nil)
           puts
           puts 'She finishes by wishing you good luck!'
 
-          return {:type => 'arena', :data => nil}
+          return { type: 'arena', data: nil }
         else
           puts 'She gives you a dirty look, as you have obviously wasted her time. You are told not to mess around with her anymore, and she turns away from you.'
-          return {:type => nil, :data => nil}
+          return { type: nil, data: nil }
         end
       else
         puts 'She can tell you seem particularly poor today and says to come back when that has changed.'
         puts
-        return {:type => nil, :data => nil}
+        return { type: nil, data: nil }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/bed.rb b/lib/gemwarrior/entities/items/bed.rb
@@ -5,6 +5,9 @@
 
 module Gemwarrior
   class Bed < Item
+    # CONSTANTS
+    USE_TEXT = '** ZZZZZ **'
+
     def initialize
       self.name         = 'bed'
       self.description  = 'The place where you sleep when you are not adventuring.'
@@ -19,12 +22,12 @@ def initialize
     def use(player = nil)
       if player.at_full_hp?
         puts 'You feel perfectly healthy and decide not to actually use the bed. Besides, the trail of fire ants currently leading up to and around the furniture seem somehow uninviting.'
-        {:type => nil, :data => nil}
+        { type: nil, data: nil }
       else
-        Animation::run({:phrase => '** ZZZZZ **'})
+        Animation::run(phrase: USE_TEXT)
         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}
+        { type: 'rest', data: 5 }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/couch.rb b/lib/gemwarrior/entities/items/couch.rb
@@ -22,7 +22,7 @@ def use(player = 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}
+        { type: 'rest', data: 1 }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/floor_tile.rb b/lib/gemwarrior/entities/items/floor_tile.rb
@@ -4,6 +4,9 @@
 require_relative '../item'
 
 module Gemwarrior
+  # CONSTANTS
+  MOVE_TEXT = '*** SHOOOOOM ***'
+
   class FloorTile < Item
     def initialize
       self.name         = 'floor_tile'
@@ -23,9 +26,9 @@ def use(player = nil)
       # stats
       player.movements_made += 1
 
-      Animation::run({ :phrase => '*** SHOOOOOM ***' })
+      Animation::run(phrase: MOVE_TEXT)
 
-      {:type => 'move', :data => 'Rock Piles'}
+      { type: 'move', data: 'Rock Piles' }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/gun.rb b/lib/gemwarrior/entities/items/gun.rb
@@ -18,7 +18,7 @@ def initialize
 
     def use(player = nil)
       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}
+      { type: nil, data: nil }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/herb.rb b/lib/gemwarrior/entities/items/herb.rb
@@ -21,10 +21,10 @@ def use(player = nil)
       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?
         puts '>> The herb has no medicinal effect, as you already feel perfectly healthy, but it was kind of tasty.'
-        {:type => nil, :data => nil}
+        { type: nil, data: nil }
       else
         puts '>> You regain a few hit points.'
-        {:type => 'health', :data => rand(3..5)}
+        { type: 'health', data: rand(3..5) }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/ladder.rb b/lib/gemwarrior/entities/items/ladder.rb
@@ -5,6 +5,9 @@
 
 module Gemwarrior
   class Ladder < Item
+    # CONSTANTS
+    USE_TEXT = '*** THUMP ***'
+
     def initialize
       self.name         = 'ladder'
       self.description  = 'Rickety and crudely-fashioned, this ladder descends down into the dropoff, hopefully heading towards something...anything.'
@@ -23,12 +26,12 @@ def use(player = nil)
       # stats
       player.movements_made += 1
 
-      Animation::run({ :phrase => '*** THUMP ***' })
+      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
diff --git a/lib/gemwarrior/entities/items/letter.rb b/lib/gemwarrior/entities/items/letter.rb
@@ -29,12 +29,12 @@ def use(player = nil)
           print "\n"
           print_letter(player)
         else
-          {:type => nil, :data => nil}
+          { type: nil, data: nil }
         end
       else
         self.used = true
         print_letter(player)
-        {:type => 'xp', :data => 3}
+        { type: 'xp', data: 3 }
       end
     end
 
@@ -43,28 +43,28 @@ def use(player = nil)
     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 #{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, #{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, #{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, #{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
diff --git a/lib/gemwarrior/entities/items/map.rb b/lib/gemwarrior/entities/items/map.rb
@@ -19,7 +19,7 @@ def initialize
     def use(player = nil)
       puts 'You unfold the piece of worn canvas, and study the markings upon it.'
 
-      {:type => 'action', :data => 'map'}
+      { type: 'action', data: 'map' }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/massive_door.rb b/lib/gemwarrior/entities/items/massive_door.rb
@@ -20,10 +20,10 @@ 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')
         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)'}
+        { type: 'move', data: 'Sky Tower (Throne Room)' }
       else
         puts 'Your hand just goes right through the astonishingly gigantic door, but the rest of your body does not. A moment later, your hand is shoved backwards by some unknown force, and you remain where you were before your unsuccessful attempt.'
-        {:type => nil, :data => nil}
+        { type: nil, data: nil }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/opalaser.rb b/lib/gemwarrior/entities/items/opalaser.rb
@@ -18,7 +18,7 @@ def initialize
 
     def use(player = nil)
       puts 'You pull the "trigger" on the opalaser, but nothing happens.'
-      {:type => nil, :data => nil}
+      { type: nil, data: nil }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/pedestal.rb b/lib/gemwarrior/entities/items/pedestal.rb
@@ -4,7 +4,10 @@
 require_relative '../item'
 
 module Gemwarrior
-  class Pedestal < Item  
+  class Pedestal < Item
+    # CONSTANTS
+    USE_TEXT = '*** WHOOOOOSH ***'
+  
     attr_accessor :switches
 
     def initialize
@@ -98,14 +101,14 @@ def use(player = nil)
             # stats
             player.movements_made += 1
             
-            Animation::run({ :phrase => '*** WHOOOOOSH ***' })
-            return {:type => 'move', :data => 'Sky Tower (Entryway)'}
+            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)
           end
         when '8'
           puts 'You step away from the mysterious pedestal.'
-          return {:type => nil, :data => nil}
+          return { type: nil, data: nil }
         else
           next
         end
diff --git a/lib/gemwarrior/entities/items/pond.rb b/lib/gemwarrior/entities/items/pond.rb
@@ -25,10 +25,10 @@ def use(player = nil)
       if (NEEDED_ITEMS - 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'}
+        return { type: 'item', data: 'Opalaser' }
       else
         puts 'You graze your fingers within the pond for a moment, feeling the coolness. You feel zen.'
-        return {:type => nil, :data => nil}
+        return { type: nil, data: nil }
       end
     end
   end
diff --git a/lib/gemwarrior/entities/items/rope.rb b/lib/gemwarrior/entities/items/rope.rb
@@ -26,7 +26,7 @@ def use(player = nil)
       # stats
       player.movements_made += 1
 
-      {:type => 'move', :data => 'Snow Fields (Southeast)'}
+      { type: 'move', data: 'Snow Fields (Southeast)' }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/small_hole.rb b/lib/gemwarrior/entities/items/small_hole.rb
@@ -76,7 +76,7 @@ def rat_shop(player)
           end
         when 'x'
           puts '>>"If you need anything further, I\'m always in this hole..."'
-          return {:type => 'purchase', :data => items_purchased}
+          return { type: 'purchase', data: items_purchased }
         else
           puts '>>"Huh?"'
           next
diff --git a/lib/gemwarrior/entities/items/snowman.rb b/lib/gemwarrior/entities/items/snowman.rb
@@ -5,6 +5,9 @@
 
 module Gemwarrior
   class Snowman < Item
+    # CONSTANTS
+    USE_TEXT = '*** FOOOOSH ***'
+
     def initialize
       self.name         = 'snowman'
       self.description  = 'Standing solemnly in the snow, a man of snow solemnly stands.'
@@ -20,9 +23,9 @@ def use(player = nil)
       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 => '*** FOOOOSH ***' })
+      Animation::run(phrase: USE_TEXT)
 
-      {:type => 'move_dangerous', :data => 'Home'}
+      { type: 'move_dangerous', data: 'Home' }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/sparklything.rb b/lib/gemwarrior/entities/items/sparklything.rb
@@ -19,7 +19,7 @@ def initialize
     def use(player = nil)
       puts 'Everything, and I mean *everything*, begins to sparkle. Huh.'
       puts
-      {:type => nil, :data => nil}
+      { type: nil, data: nil }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/tent.rb b/lib/gemwarrior/entities/items/tent.rb
@@ -18,7 +18,7 @@ def initialize
     end
 
     def use(player = nil)
-      {:type => 'tent', :data => self.number_of_uses}
+      { type: 'tent', data: self.number_of_uses }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/items/waterfall.rb b/lib/gemwarrior/entities/items/waterfall.rb
@@ -18,7 +18,7 @@ def initialize
 
     def use(player = nil)
       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)}
+      { type: 'dmg', data: rand(0..1) }
     end
   end
 end
diff --git a/lib/gemwarrior/entities/location.rb b/lib/gemwarrior/entities/location.rb
@@ -7,7 +7,7 @@ module Gemwarrior
   class Location < Entity
     # CONSTANTS
     ## HASHES
-    DANGER_LEVEL = {:none => 0, :low => 15, :moderate => 30, :high => 55, :assured => 100}
+    DANGER_LEVEL = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
 
     ## ERRORS
     ERROR_LOCATION_ITEM_REMOVE_INVALID      = 'That item cannot be removed as it does not exist here.'
diff --git a/lib/gemwarrior/entities/player.rb b/lib/gemwarrior/entities/player.rb
diff --git a/lib/gemwarrior/game.rb b/lib/gemwarrior/game.rb
diff --git a/lib/gemwarrior/misc/animation.rb b/lib/gemwarrior/misc/animation.rb
diff --git a/lib/gemwarrior/misc/music.rb b/lib/gemwarrior/misc/music.rb
diff --git a/lib/gemwarrior/misc/player_levels.rb b/lib/gemwarrior/misc/player_levels.rb
diff --git a/lib/gemwarrior/misc/wordlist.rb b/lib/gemwarrior/misc/wordlist.rb
diff --git a/lib/gemwarrior/repl.rb b/lib/gemwarrior/repl.rb
diff --git a/lib/gemwarrior/version.rb b/lib/gemwarrior/version.rb
