gemwarrior 0.10.8 → 0.11.0

data/lib/gemwarrior/misc/{music.rb → audio.rb}

@@ -1,19 +1,27 @@
-# lib/gemwarrior/misc/music.rb
-# Music cues using win32-sound or feep, depending on platform
+# lib/gemwarrior/misc/audio.rb
+# Audio cues using either synth or samples
+# Synth: win32-sound or feep, depending on platform
+# Samples: small wav files
 
 require_relative '../game_options'
+require_relative 'audio_cues'
+require_relative 'musical_notes'
 
 module Gemwarrior
-  module Music
-    def self.cue(sequence)
+  module Audio
+    def self.play_sample(audio_cue_symbol)
+      # future use
+    end
+
+    def self.play_synth(audio_cue_symbol)
       if GameOptions.data['sound_enabled']
         # if Windows, use superior win32-sound library
         if GameOptions.data['sound_system'].eql?('win32-sound')
           require 'win32/sound'
           require_relative 'musical_notes'
-        
+
           Thread.start do
-            sequence.each do |seq|
+            AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
               threads = []
               seq[:frequencies].split(',').each do |note|
                 threads << Thread.new do
@@ -36,7 +44,7 @@ module Gemwarrior
           }
       
           Thread.start do
-            sequence.each do |seq|
+            AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
               seq = feep_defaults.merge(seq)
 
               Feep::Base.new({

data/lib/gemwarrior/misc/audio_cues.rb

@@ -0,0 +1,133 @@
+# lib/gemwarrior/misc/audio_cues.rb
+# Audio cue symbol -> notes/wav_file
+
+module Gemwarrior
+  module AudioCues
+    def self.add key, val
+      @@cues ||= {}
+      @@cues[key] = val
+    end
+    
+    def self.cues
+      @@cues ||= {}
+    end
+
+    self.add :battle_start, {
+      synth: [
+        { 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 }
+      ],
+      sample: 'battle_start.wav'
+    }
+
+    self.add :battle_player_attack, {
+      synth: [{ frequencies: 'A4,E4,B5', duration: 75 }],
+      sample: 'battle_player_attack.wav'
+    }
+
+    self.add :battle_player_miss, {
+      synth: [{ frequencies: 'A4', duration: 75 }],
+      sample: 'battle_player_miss.wav'
+    }
+
+    self.add :battle_monster_attack, {
+      synth: [{ frequencies: 'B4,E#5,A5', duration: 75 }],
+      sample: 'battle_monster_attack.wav'
+    }
+
+    self.add :battle_monster_miss, {
+      synth: [{ frequencies: 'B4', duration: 75 }],
+      sample: 'battle_monster_miss.wav'
+    }
+
+    self.add :battle_win_boss, {
+      synth: [
+        { frequencies: 'E5', duration: 50 },
+        { frequencies: 'F5', duration: 50 },
+        { frequencies: 'E5', duration: 100 },
+        { frequencies: 'E5', duration: 50 },
+        { frequencies: 'F5', duration: 50 },
+        { frequencies: 'E5', duration: 100 },
+        { frequencies: 'E4,A4', duration: 50 },
+        { frequencies: 'E4,A4', duration: 200 }
+      ],
+      sample: 'battle_win_boss.wav'
+    }
+
+    self.add :battle_win_monster, {
+      synth: [
+        { frequencies: 'D5', duration: 50 },
+        { frequencies: 'E5', duration: 50 },
+        { frequencies: 'D5', duration: 100 },
+        { frequencies: 'D4', duration: 50 },
+        { frequencies: 'D4', duration: 200 }
+      ],
+      sample: 'battle_win_monster.wav'
+    }
+
+    self.add :intro, {
+      synth: [
+        { frequencies: 'A3,E5',  duration: 50 },
+        { frequencies: 'B3,F5',  duration: 50 },
+        { frequencies: 'C4,G5',  duration: 50 },
+        { frequencies: 'D4,A5',  duration: 50 },
+        { frequencies: 'E4,B5',  duration: 50 },
+        { frequencies: 'F4,C6',  duration: 50 },
+        { frequencies: 'G4,B5,D6',  duration: 500 }
+      ],
+      sample: 'intro.wav'
+    }
+    
+    self.add :player_level_up, {
+      synth: [
+        { frequencies: 'D4,A4,D5,A5,D6', duration: 100 },
+        { frequencies: 'D4,A4,D5,A5,D6', duration: 350 },
+        { frequencies: 'E4,B4,E5,B5,E6', duration: 500 }
+      ]
+    }
+
+    self.add :player_resurrection, {
+      synth: [
+        { frequencies: 'D#5', duration: 100 },
+        { frequencies: 'A4',  duration: 150 },
+        { frequencies: 'F#4', duration: 200 },
+        { frequencies: 'F4',  duration: 1000 }
+      ],
+      sample: 'player_resurrection.wav'
+    }
+
+    self.add :player_travel, {
+      synth: [
+        { frequencies: 'C4', duration: 75 },
+        { frequencies: 'D4', duration: 75 },
+        { frequencies: 'E4', duration: 75 }
+      ],
+      sample: 'player_travel.wav'
+    }
+
+    self.add :win_game, {
+      synth: [
+        { 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 }
+      ],
+      sample: 'win_game.wav'
+    }
+  end
+end

data/lib/gemwarrior/misc/formatting.rb

@@ -3,7 +3,7 @@
 
 module Gemwarrior
   module Formatting
-    def self.upstyle(str_arr)
+    def self.upstyle(str_arr, no_space = false)
       if str_arr.is_a? Array
         str_arr_upstyled = []
 
@@ -11,15 +11,15 @@ module Gemwarrior
           str_arr_item_upstyled = []
           
           str_arr_item.split(' ').each do |s|
-            str_arr_item_upstyled << upstyle_string(s)
+            str_arr_item_upstyled << upstyle_string(s, no_space)
           end
 
           str_arr_upstyled << str_arr_item_upstyled.join(' ')
         end
 
-        return str_arr_upstyled
+        str_arr_upstyled
       else
-        return upstyle_string(str_arr)
+        upstyle_string(str_arr, no_space)
       end
     end
 
@@ -35,24 +35,24 @@ module Gemwarrior
         end
         words_hooched << w
       end
-      
-      return words_hooched.join(' ')
+
+      words_hooched.join(' ')
     end
 
     private
 
-    def self.upstyle_string(s)
+    def self.upstyle_string(s, no_space)
       s_upstyle = ''
       s_upstyle << s[0].upcase
       1.upto(s.length-1) do |i|
         if s[i-1].eql?('_')
-          s_upstyle[i-1] = ' '
+          s_upstyle[i-1] = no_space ? '' : ' '
           s_upstyle << s[i].upcase
         else
           s_upstyle << s[i].downcase
         end
       end
-      return s_upstyle
+      s_upstyle
     end
   end
 end

data/lib/gemwarrior/misc/player_levels.rb

@@ -61,6 +61,14 @@ module Gemwarrior
           defense:  15,  dexterity:  16,
           special_abilities: :break_through
         }
+      else
+        {
+          level:    8,   xp_start:   10000,
+          hp_max:   200, stam_max:   200,
+          atk_lo:   50,  atk_hi:     100,
+          defense:  50,  dexterity:  100,
+          special_abilities: nil
+        }
       end
     end
 
@@ -79,6 +87,19 @@ module Gemwarrior
         6
       elsif xp < 10000
         7
+      else
+        8
+      end
+    end
+
+    def self.get_ability_description(ability)
+      case ability
+      when :rocking_vision
+        'Allows you to see the enemy hit points while in battle.'
+      when :rock_slide
+        'Adds a random boost to the player\'s attack in battle.'
+      else
+        'Unsure, but it\'s probably cool!'
       end
     end
   end

data/lib/gemwarrior/repl.rb

@@ -17,7 +17,7 @@ module Gemwarrior
   class Repl
     # CONSTANTS
     QUIT_MESSAGE            = 'Temporal flux detected. Shutting down...'.colorize(:red)
-    MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:yellow)
+    MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:red)
     SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
     GITHUB_NAME             = 'michaelchadwick'
     GITHUB_PROJECT          = 'gemwarrior'
@@ -48,7 +48,7 @@ module Gemwarrior
           prompt
           begin
             input = read_line
-            result = evaluator.evaluate(input)
+            result = evaluator.parse(input)
             if result.eql?('exit')
               exit
             elsif result.eql?('checkupdate')
@@ -161,7 +161,7 @@ module Gemwarrior
         print_options
       when '4'
         print answer
-        GameOptions.data['use_wordnik']= !GameOptions.data['use_wordnik']
+        GameOptions.data['use_wordnik'] = !GameOptions.data['use_wordnik']
         print_options
       else
         print answer
@@ -180,7 +180,7 @@ module Gemwarrior
       print ' (2) FEEP        '
       print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('feep')
       print "\n"
-      puts 
+      puts
       puts 'Enter option number to select sound system, or any other key to exit.'
       puts 'Note: win32-sound only works on Windows and will break the game is sound is enabled on non-Windows machines. Feep is cross-platform, but very slow and buggy, so use at your discretion!'
       puts
@@ -198,7 +198,7 @@ module Gemwarrior
         return
       end
     end
-    
+
     def display_log_of_attempts
       if File.exist?(GameOptions.data['log_file_path']) and !File.zero?(GameOptions.data['log_file_path'])
         File.open(GameOptions.data['log_file_path']).readlines.each do |line|
@@ -284,7 +284,7 @@ module Gemwarrior
           result = resume_game
           if result.nil?
             run_main_menu
-          elsif
+          else
             self.world = result
             self.evaluator = Evaluator.new(self.world)
             return
@@ -316,7 +316,7 @@ module Gemwarrior
         game.update_options_file
         exit
       else
-        run_main_menu(show_choices = false)
+        run_main_menu(show_choices: false)
       end
     end
 
@@ -345,7 +345,7 @@ module Gemwarrior
 
       # log stats to file in home directory
       File.open(GameOptions.data['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} MK:#{pl.monsters_killed} BK:#{pl.bosses_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
+        f.write "#{Time.now} #{pl.name.rjust(13)} - V:#{Gemwarrior::VERSION} LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} MK:#{pl.monsters_killed} BK:#{pl.bosses_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
       end
     end
 
@@ -355,11 +355,11 @@ module Gemwarrior
 
       if mode.eql? 'Y'
         File.open(GameOptions.data['save_file_yaml_path'], 'w') do |f|
-          f.write YAML::dump(world)
+          f.write YAML.dump(world)
         end
       elsif mode.eql? 'M'
         File.open(GameOptions.data['save_file_bin_path'], 'w') do |f|
-          f.write Marshal::dump(world)
+          f.write Marshal.dump(world)
         end
       else
         puts 'Error: Save file mode not set. Game not saved.'
@@ -378,7 +378,7 @@ module Gemwarrior
         false
       end
     end
-   
+
     def resume_game
       mode = GameOptions.data['save_file_mode']
       puts 'Resuming game...'
@@ -386,7 +386,7 @@ module Gemwarrior
       if mode.eql? 'Y'
         if File.exist?(GameOptions.data['save_file_yaml_path'])
           File.open(GameOptions.data['save_file_yaml_path'], 'r') do |f|
-            return YAML::load(f)
+            return YAML.load(f)
           end
         else
           puts 'No save file exists.'
@@ -395,7 +395,7 @@ module Gemwarrior
       elsif mode.eql? 'M'
         if File.exist?(GameOptions.data['save_file_marshal_path'])
           File.open(GameOptions.data['save_file_marshal_path'], 'r') do |f|
-            return Marshal::load(f)
+            return Marshal.load(f)
           end
         else
           puts 'No save file exists.'
@@ -407,17 +407,17 @@ module Gemwarrior
     def overwrite_save?
       mode = GameOptions.data['save_file_mode']
       save_file_path = ''
-      
+
       if mode.eql? 'Y'
         save_file_path = GameOptions.data['save_file_yaml_path']
       elsif mode.eql? 'M'
         save_file_path = GameOptions.data['save_file_marshal_path']
       end
-      
+
       if File.exist?(save_file_path)
         print 'Overwrite existing save file? (y/n) '
         answer = gets.chomp.downcase
-          
+
         case answer
         when 'y', 'yes'
           puts 'New game started! Press any key to continue.'
@@ -452,10 +452,7 @@ module Gemwarrior
     end
 
     def play_intro_tune
-      Music::cue([
-        { frequencies: 'A3,E4,C#5,E5',  duration: 300 },
-        { frequencies: 'A3,E4,C#5,F#5', duration: 600 }
-      ])
+      Audio.play_synth(:intro)
     end
 
     def setup_screen(initial_command = nil, extra_command = nil, new_skip = false, resume_skip = false)
@@ -472,7 +469,7 @@ module Gemwarrior
         result = resume_game
         if result.nil?
           run_main_menu
-        elsif
+        else
           self.world = result
           self.evaluator = Evaluator.new(self.world)
         end
@@ -481,15 +478,19 @@ module Gemwarrior
       end
 
       # hook to do something right off the bat
-      puts evaluator.evaluate(initial_command) unless initial_command.nil?
-      puts evaluator.evaluate(extra_command) unless extra_command.nil?
+      puts evaluator.parse(initial_command) unless initial_command.nil?
+      puts evaluator.parse(extra_command) unless extra_command.nil?
     end
 
     def prompt
-      prompt_template = "\n[LV:%2s][XP:%3s][ROX:%3s] [HP:%3s/%-3s][STM:%2s/%-2s] [%s @ %s]"
-      if GameOptions.data['debug_mode']
-        prompt_template += "[%s, %s, %s]"
-      end
+      prompt_template =  "\n"
+      prompt_template += "[LV:%2s][XP:%3s][ROX:%3s] [HP:%3s/%-3s][STM:%2s/%-2s] [".colorize(:yellow)
+      prompt_template += "%s".colorize(:green)
+      prompt_template += " @ ".colorize(:yellow)
+      prompt_template += "%s".colorize(:cyan)
+      prompt_template += "]".colorize(:yellow)
+      prompt_template += "[%s, %s, %s]".colorize(:yellow) if GameOptions.data['debug_mode']
+
       prompt_vars_arr = [
         world.player.level,
         world.player.xp,
@@ -499,18 +500,18 @@ module Gemwarrior
         world.player.stam_cur,
         world.player.stam_max,
         world.player.name,
-        world.location_by_coords(world.player.cur_coords).name
+        world.location_by_coords(world.player.cur_coords).name_display
       ]
       if GameOptions.data['debug_mode']
         prompt_vars_arr.push(world.player.cur_coords[:x], world.player.cur_coords[:y], world.player.cur_coords[:z])
       end
-      print (prompt_template % prompt_vars_arr).colorize(:yellow)
+      print (prompt_template % prompt_vars_arr)
       print "\n"
     end
 
     def command_exists?(cmd)
-      ENV['PATH'].split(File::PATH_SEPARATOR).collect { |d| 
-        Dir.entries d if Dir.exist? d 
+      ENV['PATH'].split(File::PATH_SEPARATOR).collect { |d|
+        Dir.entries d if Dir.exist? d
       }.flatten.include?(cmd)
     end
   end