gemwarrior 0.9.26 → 0.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107f1e7b40ef5dee781180e7ffbb1add6696bf29
-  data.tar.gz: 3915864403a1d5969daecc7da9e89b691acfe9bf
+  metadata.gz: 7a8d128428751086aeb493bdabeb39ffc4250095
+  data.tar.gz: d08b1a49df6a91d88b9e0fe17b3ef2ae95c1757e
 SHA512:
-  metadata.gz: 2aa48bb8109a9264b5472d311a8fddd3666da3c5f9f2d4181e9ea2201fa5e4501378121f3b70d4b069766da968ca79f9a2cabd83da330f544ccc486df9a65a11
-  data.tar.gz: 5be06f477fe64a1ba59940c3bac72cb84baa0a96763e39ccf8bcdec585842d74bacec7f3f2fca09b4fa956da749432261dbcfa1c1233ce36573a6b3aaab9c977
+  metadata.gz: 61bdfaffb94b06c7c8021054057de148c0f6c22854ba44b1af672a66d7964aea8669aac02e1c7895e7b108424a31dad155fc1d4bae9aa2d29b6ab45f49e5f4a7
+  data.tar.gz: f8c4e19799b4874c776bf2cad890671fcdb74209d073d6a1c7d6a6fe3b582822f3fc5d20a0cf844cdda3ec834b111e88d548b6dd4d7dea3ce952e7213fd7ec6f

data/gemwarrior.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
   spec.add_runtime_dependency 'feep', '~> 0.1.3'
   spec.add_runtime_dependency 'github_api', '~> 0.12.4'
-  
+
   # gems for future features
-  #spec.add_runtime_dependency 'hr', '~> 0.0.2'
+  # spec.add_runtime_dependency 'hr', '~> 0.0.2'
 
   spec.add_development_dependency 'pry-byebug', '~> 3.0'
   spec.add_development_dependency 'bundler', '~> 1.8'

data/lib/gemwarrior/arena.rb

@@ -20,9 +20,9 @@ module Gemwarrior
 
       loop do
         monster = generate_monster
-        battle = Battle.new({:world => self.world, :player => self.player, :monster => monster})
+        battle = Battle.new(world: world, player: player, monster: monster)
         result = battle.start(is_arena = true)
-        
+
         if result.eql?('death')
           return 'death'
         end
@@ -56,7 +56,7 @@ module Gemwarrior
       random_monster = nil
 
       loop do
-        random_monster = world.monsters[rand(0..world.monsters.length-1)].clone
+        random_monster = world.monsters[rand(0..world.monsters.length - 1)].clone
 
         unless random_monster.is_boss
           break

data/lib/gemwarrior/battle.rb

@@ -25,20 +25,20 @@ module Gemwarrior
     def start(is_arena = nil, is_event = nil)
       if world.sound
         Music::cue([
-          {:frequencies => 'G4',  :duration => 50},
-          {:frequencies => 'G#4',  :duration => 50},
-          {:frequencies => 'G4',  :duration => 50},
-          {:frequencies => 'G#4',  :duration => 50},
-          {:frequencies => 'G4',  :duration => 50},
-          {:frequencies => 'G#4',  :duration => 50}
+          { frequencies: 'G4',  duration: 50 },
+          { frequencies: 'G#4', duration: 50 },
+          { frequencies: 'G4',  duration: 50 },
+          { frequencies: 'G#4', duration: 50 },
+          { frequencies: 'G4',  duration: 50 },
+          { frequencies: 'G#4', duration: 50 }
         ])
       end
-          
+
       print_battle_line
 
       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
@@ -74,7 +74,7 @@ module Gemwarrior
         end
 
         puts
-        
+
         # print health info
         print "#{player.name.upcase.ljust(12)} :: #{player.hp_cur.to_s.rjust(3)} HP"
         if world.debug_mode
@@ -123,7 +123,7 @@ module Gemwarrior
           dmg = calculate_damage_to(monster)
           if dmg > 0
             if world.sound
-              Music::cue([{:frequencies => 'A4,E4,B5', :duration => 75}])
+              Music::cue([{ frequencies: 'A4,E4,B5', duration: 75 }])
             end
             take_damage(monster, dmg)
             if monster_dead?
@@ -132,7 +132,7 @@ module Gemwarrior
             end
           else
             if world.sound
-              Music::cue([{:frequencies => 'A4', :duration => 75}])
+              Music::cue([{ frequencies: 'A4', duration: 75 }])
             end
             puts 'You miss entirely!'.colorize(:yellow)
           end
@@ -173,16 +173,16 @@ module Gemwarrior
 
     private
 
-    # NEUTRAL   
+    # NEUTRAL
     def calculate_damage_to(entity)
       miss = rand(0..(100 + entity.defense))
-      if (miss < 15)
+      if miss < 15
         0
       else
         if entity.eql?(monster)
           # base attack range
           atk_range = player.atk_lo..player.atk_hi
-          
+
           # beast mode modifier
           if player.beast_mode
             atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
@@ -201,7 +201,7 @@ module Gemwarrior
           return rand(atk_range)
         else
           dmg = rand(monster.atk_lo..monster.atk_hi)
-          dmg = dmg - (entity.defense / 2) if player_is_defending
+          dmg -= (entity.defense / 2) if player_is_defending
           return dmg
         end
       end
@@ -218,7 +218,7 @@ module Gemwarrior
       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
 
@@ -239,16 +239,16 @@ module Gemwarrior
 
     def monster_attacks_player
       puts "#{monster.name} attacks you!"
-            
+
       dmg = calculate_damage_to(player)
       if dmg > 0
         if world.sound
-          Music::cue([{:frequencies => 'B4,E#5,A5', :duration => 75}])
+          Music::cue([{ frequencies: 'B4,E#5,A5', duration: 75 }])
         end
         take_damage(player, dmg)
       else
         if world.sound
-          Music::cue([{:frequencies => 'B4', :duration => 75}])
+          Music::cue([{ frequencies: 'B4', duration: 75 }])
         end
         puts "#{monster.name} misses entirely!".colorize(:yellow)
       end
@@ -272,21 +272,21 @@ module Gemwarrior
         # end game boss!
         if monster.name.eql?('Emerald')
           Music::cue([
-            {:frequencies => 'G3',  :duration => 250},
-            {:frequencies => 'A3',  :duration => 50},
-            {:frequencies => 'B3',  :duration => 50},
-            {:frequencies => 'C4',  :duration => 50},
-            {:frequencies => 'D4',  :duration => 250},
-            {:frequencies => 'E4',  :duration => 50},
-            {:frequencies => 'F#4', :duration => 50},
-            {:frequencies => 'G4',  :duration => 50},
-            {:frequencies => 'A4',  :duration => 250},
-            {:frequencies => 'B4',  :duration => 50},
-            {:frequencies => 'C5',  :duration => 50},
-            {:frequencies => 'D5',  :duration => 50},
-            {:frequencies => 'E5',  :duration => 50},
-            {:frequencies => 'F#5', :duration => 50},
-            {:frequencies => 'G5',  :duration => 1000}
+            { frequencies: 'G3',  duration: 250 },
+            { frequencies: 'A3',  duration: 50 },
+            { frequencies: 'B3',  duration: 50 },
+            { frequencies: 'C4',  duration: 50 },
+            { frequencies: 'D4',  duration: 250 },
+            { frequencies: 'E4',  duration: 50 },
+            { frequencies: 'F#4', duration: 50 },
+            { frequencies: 'G4',  duration: 50 },
+            { frequencies: 'A4',  duration: 250 },
+            { frequencies: 'B4',  duration: 50 },
+            { frequencies: 'C5',  duration: 50 },
+            { frequencies: 'D5',  duration: 50 },
+            { frequencies: 'E5',  duration: 50 },
+            { frequencies: 'F#5', duration: 50 },
+            { frequencies: 'G5',  duration: 1000 }
           ])
           puts monster.defeated_text
           gets
@@ -296,7 +296,7 @@ module Gemwarrior
           puts " XP : #{monster.xp}".colorize(:green)
           puts " ROX: #{monster.rox}".colorize(:green)
           print_battle_line
-          player.update_stats({:reason => :monster, :value => monster})
+          player.update_stats(reason: monster, value: monster)
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
@@ -307,7 +307,7 @@ module Gemwarrior
           puts " ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
         end
         print_battle_line
-        player.update_stats({:reason => :monster, :value => monster})
+        player.update_stats(reason: monster, value: monster)
         world.location_by_coords(player.cur_coords).remove_monster(monster.name)
       end
     end
@@ -324,20 +324,20 @@ module Gemwarrior
     def player_death
       if world.sound
         Music::cue([
-          {:frequencies => 'D#5', :duration => 100},
-          {:frequencies => 'A4', :duration => 150},
-          {:frequencies => 'F#4', :duration => 200},
-          {:frequencies => 'F4', :duration => 1000}
+          { frequencies: 'D#5', duration: 100 },
+          { frequencies: 'A4',  duration: 150 },
+          { frequencies: 'F#4', duration: 200 },
+          { frequencies: 'F4',  duration: 1000 }
         ])
       end
-      
+
       puts "You are dead, slain by the #{monster.name}!".colorize(:red)
       print_battle_line
     end
 
     def player_escape?(is_arena)
       unless is_arena
-        if (player.dexterity > monster.dexterity)
+        if player.dexterity > monster.dexterity
           return true
         else
           dex_diff = monster.dexterity - player.dexterity
@@ -355,7 +355,7 @@ module Gemwarrior
     # STATUS TEXT
 
     def print_escape_text
-      Animation::run({ :phrase => '** POOF **', :oneline => true })
+      Animation::run(phrase: '** POOF **', oneline: true)
     end
 
     def print_battle_line

data/lib/gemwarrior/evaluator.rb

@@ -3,7 +3,7 @@
 
 require_relative 'arena'
 
-module Gemwarrior  
+module Gemwarrior
   class Evaluator
     # CONSTANTS
     ## MESSAGES
@@ -42,8 +42,8 @@ module Gemwarrior
     ERROR_DEBUG_TELEPORT_PARAMS_NEEDED  = 'You cannot just "teleport" to an x coordinate without a y coordinate.'
     ERROR_DEBUG_TELEPORT_PARAMS_INVALID = 'You cannot teleport there...yet.'
 
-    attr_accessor :world, 
-                  :commands, :aliases, :extras, :cmd_descriptions, 
+    attr_accessor :world,
+                  :commands, :aliases, :extras, :cmd_descriptions,
                   :devcommands, :devaliases, :devextras, :devcmd_descriptions
 
     def initialize(world)
@@ -223,8 +223,8 @@ module Gemwarrior
                 z_coord = param3.to_i.to_s == param3 ? param3.to_i : world.player.cur_coords[:z]
 
                 # check to make sure new location exists
-                if world.location_by_coords({:x => x_coord, :y => y_coord, :z => z_coord})
-                  world.player.cur_coords = {:x => x_coord, :y => y_coord, :z => z_coord}
+                if world.location_by_coords(x: x_coord, y: y_coord, z: z_coord)
+                  world.player.cur_coords = {x: x_coord, y: y_coord, z: z_coord}
                 else
                   return ERROR_DEBUG_TELEPORT_PARAMS_INVALID
                 end
@@ -248,15 +248,15 @@ module Gemwarrior
 
             # stats
             world.player.movements_made += 1
-            
-            Animation::run({:phrase => '** TELEPORT! **', :speed => :insane})
+
+            Animation::run(phrase: '** TELEPORT! **', speed: :insane)
             return world.describe(world.location_by_coords(world.player.cur_coords))
           end
         when 'levelbump', 'lb'
-          world.player.update_stats({:reason => :level_bump, :value => 1})
+          world.player.update_stats(reason: :level_bump, value: 1)
         when 'restfight', 'rf'
           result = world.player.rest(world, nil, true)
-          
+
           if result.eql?('death')
             player_death_resurrection
           end
@@ -278,7 +278,7 @@ module Gemwarrior
         tent_uses = 0
         player_inventory = world.player.inventory.items
         location_inventory = world.location_by_coords(world.player.cur_coords).items
-        
+
         if player_inventory.map(&:name).include?('tent')
           player_inventory.each do |i|
             if i.name.eql?('tent')
@@ -286,7 +286,7 @@ module Gemwarrior
                 result = i.use(world.player)
                 tent_uses = i.number_of_uses
                 i.number_of_uses -= 1
-                
+
                 puts "The tent can be used when resting #{i.number_of_uses} more time(s)."
               end
             end
@@ -298,15 +298,15 @@ module Gemwarrior
                 result = i.use(world.player)
                 tent_uses = i.number_of_uses
                 i.number_of_uses -= 1
-                
+
                 puts "The tent can be used when resting #{i.number_of_uses} more time(s)."
               end
             end
           end
         end
-        
+
         result = world.player.rest(world, tent_uses)
-        
+
         if result.eql?('death')
           player_death_resurrection
         end
@@ -405,7 +405,7 @@ module Gemwarrior
               world.player.heal_damage(result[:data])
               return
             when 'xp'
-              world.player.update_stats({:reason => :xp, :value => result[:data]})
+              world.player.update_stats(reason: :xp, value: result[:data])
               return
             when 'tent'
               world.player.rest(world, result[:data])
@@ -417,9 +417,9 @@ module Gemwarrior
                 world.print_map(world.player.cur_coords[:z])
               end
             when 'arena'
-              arena = Arena.new({:world => world, :player => world.player})
+              arena = Arena.new(world: world, player: world.player)
               result = arena.start
-              
+
               if result.eql?('death')
                 player_death_resurrection
               end
@@ -440,7 +440,7 @@ module Gemwarrior
           ERROR_DROP_PARAM_MISSING
         else
           world.player.inventory.drop_item(param1)
-        end  
+        end
       when 'equip', 'eq'
         if param1.nil?
           ERROR_EQUIP_PARAM_MISSING
@@ -493,7 +493,7 @@ module Gemwarrior
           if world.has_monster_to_attack?(monster_name)
             monster = world.location_by_coords(world.player.cur_coords).monster_by_name(monster_name)
             result = world.player.attack(world, monster)
-            
+
             if result.eql?('death')
               player_death_resurrection
             elsif result.eql?('exit')
@@ -518,9 +518,9 @@ module Gemwarrior
       when 'help', 'h'
         list_commands
       when 'quit', 'exit', 'q', 'x'
-        puts "You sure you want to quit? (y/n): "
+        puts 'You sure you want to quit? (y/n): '
         response = gets.chomp.downcase
-        if (response.eql?("y") || response.eql?("yes"))
+        if (response.eql?('y') || response.eql?('yes'))
           puts QUIT_MESSAGE
           return 'exit'
         else
@@ -570,7 +570,7 @@ module Gemwarrior
       print_separator
       commands.each do |cmd|
         puts " #{cmd.ljust(9)}, #{aliases[i].ljust(2)} -- #{cmd_descriptions[i]}"
-        i = i + 1
+        i += 1
       end
       print_separator
 
@@ -580,7 +580,7 @@ module Gemwarrior
         i = 0
         devcommands.each do |cmd|
           puts " #{cmd.ljust(9)}, #{devaliases[i].ljust(2)} -- #{devcmd_descriptions[i]}"
-          i = i + 1
+          i += 1
         end
         print_separator
       end
@@ -596,7 +596,7 @@ module Gemwarrior
       end
 
       if commands_and_aliases.include?(command.downcase)
-        if tokens.size.between?(1,4)
+        if tokens.size.between?(1, 4)
           return true
         end
       elsif tokens.empty?

data/lib/gemwarrior/game.rb

@@ -26,7 +26,7 @@ module Gemwarrior
     PLAYER_ROX_DEFAULT        = 0
     PLAYER_ROX_DEBUG          = 300
 
-    attr_accessor :world, :eval, :repl
+    attr_accessor :world, :evaluator, :repl
 
     def initialize(options)
       # create new world and player
@@ -65,8 +65,8 @@ module Gemwarrior
       update_options_file(world)
       
       # create the console
-      self.eval = Evaluator.new(world)
-      self.repl = Repl.new(self, world, eval)
+      self.evaluator  = Evaluator.new(world)
+      self.repl       = Repl.new(self, world, evaluator)
 
       # enter Jool!
       repl.start('look', world.extra_command)

data/lib/gemwarrior/inventory.rb

@@ -22,9 +22,9 @@ module Gemwarrior
 
     def list_contents
       if items.nil? || items.empty?
-        return contents_text = '[empty]'
+        return '[empty]'
       else
-        return contents_text = "#{items.map(&:name).join ', '}"
+        return "#{items.map(&:name).join ', '}"
       end
     end
 
@@ -110,10 +110,10 @@ module Gemwarrior
       if contains_item?(item_name)
         puts "Are you sure you want to permanently throw away #{item_name}? (Y/N)"
         answer = gets.downcase.chomp!
-        
+
         if answer.eql?('y')
           remove_item(item_name)
-        
+
           return "The #{item_name} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone."
         else
           return "You decide to keep #{item_name} for now."

data/lib/gemwarrior/misc/music.rb

@@ -1,16 +1,12 @@
 # lib/gemwarrior/misc/music.rb
 # Music cues using win32-sound
 
-require 'feep'
-require 'win32/sound'
-
-require_relative 'musical_notes'
-
 module Gemwarrior
   module Music
     def self.cue(sequence)
       # if Windows, use superior win32-sound library
       if OS.windows?
+        require 'win32/sound'
         threads = []
 
         Thread.start {
@@ -25,10 +21,13 @@ module Gemwarrior
         }
       # otherwise, use inferior feep library
       else
+        require 'feep'
+        require_relative 'musical_notes'
+
         feep_defaults = {
-          :frequencies  => '440', 
-          :waveform     => 'sine', 
-          :volume       => 0.3, 
+          :frequencies  => '440',
+          :waveform     => 'sine',
+          :volume       => 0.3,
           :duration     => 500,
           :notext       => true
         }
@@ -38,9 +37,9 @@ module Gemwarrior
             seq = feep_defaults.merge(seq)
 
             Feep::Base.new({
-              :freq_or_note => seq[:frequencies], 
-              :waveform     => seq[:waveform], 
-              :volume       => seq[:volume], 
+              :freq_or_note => seq[:frequencies],
+              :waveform     => seq[:waveform],
+              :volume       => seq[:volume],
               :duration     => seq[:duration],
               :notext       => seq[:notext]
             })

data/lib/gemwarrior/repl.rb

@@ -12,7 +12,7 @@ require_relative 'misc/wordlist'
 require_relative 'evaluator'
 require_relative 'version'
 
-module Gemwarrior  
+module Gemwarrior
   class Repl
     # CONSTANTS
     ## MESSAGES
@@ -23,12 +23,12 @@ module Gemwarrior
     GITHUB_NAME             = 'michaelchadwick'
     GITHUB_PROJECT          = 'gemwarrior'
 
-    attr_accessor :game, :world, :eval
+    attr_accessor :game, :world, :evaluator
 
     def initialize(game, world, evaluator)
-      self.game   = game
-      self.world  = world
-      self.eval   = evaluator
+      self.game         = game
+      self.world        = world
+      self.evaluator    = evaluator
     end
 
     def start(initial_command = nil, extra_command = nil)
@@ -43,13 +43,13 @@ module Gemwarrior
         log_stats(duration, pl)
       end
 
-      clocker.clock {
+      clocker.clock do
         # main loop
         loop do
           prompt
           begin
             input = read_line
-            result = eval.evaluate(input)
+            result = evaluator.evaluate(input)
             if result.eql?('exit')
               exit
             else
@@ -61,7 +61,7 @@ module Gemwarrior
             exit
           end
         end
-      }
+      end
     end
 
     private
@@ -75,7 +75,7 @@ module Gemwarrior
       Readline.readline(prompt_text, true).to_s
     end
 
-    def puts(s='', width=WRAP_WIDTH)
+    def puts(s = '', width = WRAP_WIDTH)
       super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
     end
 
@@ -87,10 +87,10 @@ module Gemwarrior
     end
 
     def print_splash_message
-      SPLASH_MESSAGE.length.times do print '=' end
+      SPLASH_MESSAGE.length.times { print '=' }
       puts
       puts SPLASH_MESSAGE
-      SPLASH_MESSAGE.length.times do print '=' end
+      SPLASH_MESSAGE.length.times { print '=' }
       puts
     end
 
@@ -110,7 +110,7 @@ module Gemwarrior
       puts
       puts 'Explore the land of Jool with the power of text, fighting enemies to improve your station, grabbing curious items that may or may not come in handy, and finally defeating Mr. Emerald himself to win the game.'
     end
-    
+
     def print_help_text
       puts 'Gem Warrior - Some Basic Help Commands'
       puts '======================================'
@@ -123,8 +123,8 @@ module Gemwarrior
       options = read_options_file
 
       puts
-      puts  'Gem Warrior Options'
-      puts  '======================='
+      puts 'Gem Warrior Options'
+      puts '======================='
       if options.nil?
         puts 'No options set yet.'
       else
@@ -134,17 +134,17 @@ module Gemwarrior
         options.each do |op|
           option = op[0]
           value = op[1].eql?('true') ? 'ON' : 'OFF'
-          
+
           print " #{count} #{option.ljust(12).upcase} : #{value}\n"
           count += 1
         end
       end
-      puts  '======================='
+      puts '======================='
       puts
-      puts  'Enter option number to toggle value, or any other key to return to main menu.'
+      puts 'Enter option number to toggle value, or any other key to return to main menu.'
       print 'Option? '
       answer = STDIN.getch
-      
+
       case answer
       when '1'
         print answer
@@ -163,7 +163,7 @@ module Gemwarrior
     end
 
     def display_log
-      if File.exists?(game.get_log_file_path)
+      if File.exist?(game.get_log_file_path)
         File.open(game.get_log_file_path).readlines.each do |line|
           print "#{line}"
         end
@@ -258,44 +258,43 @@ module Gemwarrior
           options << line.chomp.split('|')
         end
         return options
-      else
-        nil
       end
+      nil
     end
 
     def log_stats(duration, pl)
-      puts  '######################################################################'
-      print 'Gem Warrior'.colorize(:color => :white, :background => :black)
+      puts '######################################################################'
+      print 'Gem Warrior'.colorize(color: :white, background: :black)
       print " v#{Gemwarrior::VERSION}".colorize(:yellow)
-      print " played for #{duration[:mins].to_s.colorize(:color => :white, :background => :black)} mins, #{duration[:secs].to_s.colorize(:color => :white, :background => :black)} secs, and #{duration[:ms].to_s.colorize(:color => :white, :background => :black)} ms\n"
+      print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} mins, #{duration[:secs].to_s.colorize(color: :white, background: :black)} secs, and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms\n"
       puts  '----------------------------------------------------------------------'
-      print "Player killed #{pl.monsters_killed.to_s.colorize(:color => :white, :background => :black)} monster(s)"
+      print "Player killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
       print "\n".ljust(8)
-      print "picked up #{pl.items_taken.to_s.colorize(:color => :white, :background => :black)} item(s)"
+      print "picked up #{pl.items_taken.to_s.colorize(color: :white, background: :black)} item(s)"
       print "\n".ljust(8)
-      print "traveled #{pl.movements_made.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      print "traveled #{pl.movements_made.to_s.colorize(color: :white, background: :black)} time(s)"
       print "\n".ljust(8)
-      print "rested #{pl.rests_taken.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      print "rested #{pl.rests_taken.to_s.colorize(color: :white, background: :black)} time(s)"
       print "\n".ljust(8)
-      print "died #{pl.deaths.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      print "died #{pl.deaths.to_s.colorize(color: :white, background: :black)} time(s)"
       print "\n"
       puts '######################################################################'
-      
+
       # log stats to file in home directory
       File.open(game.get_log_file_path, 'a') do |f|
         f.write "#{Time.now} #{pl.name.rjust(10)} - V:#{Gemwarrior::VERSION} LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
       end
     end
-    
+
     def play_intro_tune
       if world.sound
         Music::cue([
-          {:frequencies => 'A3,E4,C#5,E5', :duration => 300},
-          {:frequencies => 'A3,E4,C#5,F#5', :duration => 600}
+          { frequencies: 'A3,E4,C#5,E5',  duration: 300},
+          { frequencies: 'A3,E4,C#5,F#5', duration: 600}
         ])
       end
     end
-    
+
     def setup_screen(initial_command = nil, extra_command = nil)
       # welcome player to game
       clear_screen
@@ -311,8 +310,8 @@ module Gemwarrior
       end
 
       # hook to do something right off the bat
-      puts eval.evaluate(initial_command) unless initial_command.nil?
-      puts eval.evaluate(extra_command) unless extra_command.nil?
+      puts evaluator.evaluate(initial_command) unless initial_command.nil?
+      puts evaluator.evaluate(extra_command) unless extra_command.nil?
     end
 
     def prompt
@@ -324,7 +323,7 @@ module Gemwarrior
         world.player.level,
         world.player.xp,
         world.player.rox,
-        world.player.hp_cur, 
+        world.player.hp_cur,
         world.player.hp_max,
         world.player.stam_cur,
         world.player.stam_max,

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -17,7 +17,7 @@ module Gemwarrior
     ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
     ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
 
-    attr_accessor :monsters, :locations, :player, 
+    attr_accessor :monsters, :locations, :player,
                   :debug_mode, :use_wordnik, :sound, :new_game, :extra_command
 
     def initialize
@@ -37,18 +37,18 @@ module Gemwarrior
     end
 
     def print_map(floor)
-      0.upto(WORLD_DIM_HEIGHT-1) do |count_y|
+      0.upto(WORLD_DIM_HEIGHT - 1) do |count_y|
         print '  '
-        0.upto(WORLD_DIM_WIDTH-1) do
+        0.upto(WORLD_DIM_WIDTH - 1) do
           print '---'
         end
         print "\n"
-        print "#{(WORLD_DIM_HEIGHT-1) - count_y} "
-        0.upto(WORLD_DIM_WIDTH-1) do |count_x|
+        print "#{(WORLD_DIM_HEIGHT - 1) - count_y} "
+        0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
           cur_map_coords = {
-            :x => count_x, 
-            :y => (WORLD_DIM_HEIGHT-1) - count_y, 
-            :z => floor.nil? ? self.player.cur_coords[:z] : floor.to_i
+            x: count_x,
+            y: (WORLD_DIM_HEIGHT - 1) - count_y,
+            z: floor.nil? ? self.player.cur_coords[:z] : floor.to_i
           }
           if self.player.cur_coords.eql?(cur_map_coords)
             print '|O|'
@@ -61,12 +61,12 @@ module Gemwarrior
         print "\n"
       end
       print '  '
-      0.upto(WORLD_DIM_WIDTH-1) do
+      0.upto(WORLD_DIM_WIDTH - 1) do
         print '---'
       end
       puts
       print '   '
-      0.upto(WORLD_DIM_WIDTH-1) do |count_x|
+      0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
         print "#{count_x}  "
       end
       if debug_mode
@@ -91,13 +91,13 @@ module Gemwarrior
           monsters.map { |m| print m.describe }
           return
         else
-          monster_text =  ">> monsters: #{monsters.map(&:name).join(', ')}"
+          ">> monsters: #{monsters.map(&:name).join(', ')}"
         end
       when 'items'
         item_count = 0
         locations.each do |l|
-          l.items.each do |i|
-            item_count = item_count + 1
+          l.items.each do
+            item_count += 1
           end
         end
         puts "[ITEMS](#{item_count})".colorize(:yellow)
@@ -172,7 +172,7 @@ module Gemwarrior
 
     def describe_entity(point, entity_name)
       entity_name.downcase!
-      
+
       if point.has_item?(entity_name)
         point.items.each do |i|
           if i.name.downcase.eql?(entity_name)
@@ -257,15 +257,15 @@ module Gemwarrior
       end
 
       self.monsters = [
-        Alexandrat.new, 
-        Amberoo.new, 
-        Amethystle.new, 
-        Apatiger.new, 
-        Aquamarine.new, 
-        Bloodstorm.new, 
-        Citrinaga.new, 
-        Coraliz.new, 
-        Cubicat.new, 
+        Alexandrat.new,
+        Amberoo.new,
+        Amethystle.new,
+        Apatiger.new,
+        Aquamarine.new,
+        Bloodstorm.new,
+        Citrinaga.new,
+        Coraliz.new,
+        Cubicat.new,
         Diaman.new,
         Emerald.new,
         Garynetty.new
@@ -281,27 +281,27 @@ module Gemwarrior
 
       location_data = YAML.load_file(LOCATION_DATA_FILE)
 
-      location_data.each {|l|
+      location_data.each do |l|
         locations.push(Location.new({
-          :name                 => l['name'],
-          :description          => l['description'],
-          :danger_level         => l['danger_level'],
-          :monster_level_range  => l['monster_level_range'].nil? ? nil : l['monster_level_range']['lo']..l['monster_level_range']['hi'],
-          :coords               => {
-                                    :x => l['coords']['x'], 
-                                    :y => l['coords']['y'],
-                                    :z => l['coords']['z']
-                                   },
-          :locs_connected       => {
-                                    :north => l['locs_connected']['north'], 
-                                    :east => l['locs_connected']['east'], 
-                                    :south => l['locs_connected']['south'], 
-                                    :west => l['locs_connected']['west']
-                                   },
-          :items                => create_item_objects(l['items']),
-          :bosses_abounding     => create_boss_objects(l['bosses_abounding'])
+          name:                 l['name'],
+          description:          l['description'],
+          danger_level:         l['danger_level'],
+          monster_level_range:  l['monster_level_range'].nil? ? nil : l['monster_level_range']['lo']..l['monster_level_range']['hi'],
+          coords:               {
+                                  x: l['coords']['x'],
+                                  y: l['coords']['y'],
+                                  z: l['coords']['z']
+                                },
+          locs_connected:       {
+                                  north:  l['locs_connected']['north'],
+                                  east:   l['locs_connected']['east'],
+                                  south:  l['locs_connected']['south'],
+                                  west:   l['locs_connected']['west']
+                                },
+          items:                create_item_objects(l['items']),
+          bosses_abounding:     create_boss_objects(l['bosses_abounding'])
         }))
-      }
+      end
 
       return locations
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.26
+  version: 0.9.27
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -323,4 +323,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/rubywarrior_spec.rb
+- spec/spec_helper.rb