gemwarrior 0.9.23 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98fe21d4e8bc60fc35a70412c557c61c3b58a2c
-  data.tar.gz: 8f1c02ecc713082b4049b01add40eb2d5209cc80
+  metadata.gz: e9a1b18616466767287b7ffa529ea5601c8fc44b
+  data.tar.gz: 18b96dfb87948ec1aae7b6dcc689ca61473ccf7d
 SHA512:
-  metadata.gz: 6fd750bdd5b1791f61d6cd295e682c0b66d9abcd0e22934fda3e5d580b0eee8858dc86882e07c2a910571dea52904cfdceb8a3be3280e5be5ea114e2354b047c
-  data.tar.gz: 3f981fef70c2c9e8444e2dc5e0e4e47a52a901d775581012ac384e2d0df16443ed6ac7980cdc75d0ff578af1094fb317b86d2f6e890be357dd531a345c34851c
+  metadata.gz: 76d1391273ec80e83ed990557c69f7906a25b94a258a0d30ccc5f017dfb293ecb88ac37400ab9e59e34e0fdf9cb3ca57ca4163a950dfffa0b1f9493a2d3bdab5
+  data.tar.gz: e36826f4e67b5e6c171d9456429f95d7b8b98d6d562cb1f76e887dddacda65dcfba9dfda7fe35091a283a9fe945273c1cb14bcd42b79fe8d78f9552bf7a2bd1f

data/gemwarrior.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.7.7'
   spec.add_runtime_dependency 'matrext', '~> 0.4.8'
   spec.add_runtime_dependency 'clocker', '~> 0.1.2'
-  spec.add_runtime_dependency 'feep', '~> 0.1.3'
+  spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
   spec.add_runtime_dependency 'github_api', '~> 0.12.4'
   
   # gems for future features

data/lib/gemwarrior/battle.rb

@@ -23,6 +23,17 @@ module Gemwarrior
     end
 
     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}
+        ])
+      end
+          
       print_battle_line
 
       if is_arena
@@ -47,8 +58,8 @@ module Gemwarrior
       # main battle loop
       loop do
         if monster_dead?
-          monster_death
-          return
+          result = monster_death
+          return result
         elsif player_dead?
           player_death
           return 'death'
@@ -111,12 +122,18 @@ module Gemwarrior
           puts "You attack #{monster.name}#{player.cur_weapon_name}!"
           dmg = calculate_damage_to(monster)
           if dmg > 0
+            if world.sound
+              Music::cue([{:frequencies => 'A4,E4,B5', :duration => 75}])
+            end
             take_damage(monster, dmg)
             if monster_dead?
-              monster_death
-              return
+              result = monster_death
+              return result
             end
           else
+            if world.sound
+              Music::cue([{:frequencies => 'A4', :duration => 75}])
+            end
             puts 'You miss entirely!'.colorize(:yellow)
           end
         when 'defend', 'd'
@@ -222,10 +239,17 @@ 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}])
+        end
         take_damage(player, dmg)
       else
+        if world.sound
+          Music::cue([{:frequencies => 'B4', :duration => 75}])
+        end
         puts "#{monster.name} misses entirely!".colorize(:yellow)
       end
     end
@@ -248,14 +272,21 @@ module Gemwarrior
         # end game boss!
         if monster.name.eql?('Emerald')
           Music::cue([
-            {:freq_or_note => 'G3', :duration => 50},
-            {:freq_or_note => 'A3', :duration => 50},
-            {:freq_or_note => 'B3', :duration => 50},
-            {:freq_or_note => 'C4', :duration => 50},
-            {:freq_or_note => 'D4', :duration => 50},
-            {:freq_or_note => 'E4', :duration => 50},
-            {:freq_or_note => 'F#4', :duration => 50},
-            {:freq_or_note => 'G4', :duration => 50}
+            {: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
@@ -291,6 +322,15 @@ module Gemwarrior
     end
 
     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}
+        ])
+      end
+      
       puts "You are dead, slain by the #{monster.name}!".colorize(:red)
       print_battle_line
     end

data/lib/gemwarrior/entities/player.rb

@@ -225,6 +225,8 @@ module Gemwarrior
       result = battle.start
       if result.eql?('death')
         return 'death'
+      elsif result.eql?('exit')
+        return 'exit'
       end
     end
 
@@ -308,6 +310,15 @@ module Gemwarrior
     private
 
     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}
+        ])
+      end
+      
       puts 'Your actions have reduced you to death.'.colorize(:red)
       puts 'Somehow, however, your adventure does not end here. Instead, you are whisked back home via some magical force, a bit worse for the weary and somewhat poorer, but ALIVE!'.colorize(:yellow)
       return 'death'
@@ -315,14 +326,14 @@ module Gemwarrior
 
     # TRAVEL
     def print_traveling_text(direction_text, sound)
-      Animation::run({:oneline => false, :phrase => "* #{direction_text} *"})
       if sound
         Music::cue([
-          {:freq_or_note => 'C3', :duration => 75},
-          {:freq_or_note => 'D3', :duration => 75},
-          {:freq_or_note => 'E3', :duration => 75}
+          {:frequencies => 'C4', :duration => 75},
+          {:frequencies => 'D4', :duration => 75},
+          {:frequencies => 'E4', :duration => 75}
         ])
       end
+      Animation::run({:oneline => false, :phrase => "* #{direction_text} *"})
     end
 
     # CHARACTER

data/lib/gemwarrior/evaluator.rb

@@ -496,6 +496,8 @@ module Gemwarrior
             
             if result.eql?('death')
               player_death_resurrection
+            elsif result.eql?('exit')
+              return 'exit'
             end
           else
             ERROR_ATTACK_PARAM_INVALID
@@ -545,7 +547,9 @@ module Gemwarrior
     end
 
     def player_death_resurrection
-      puts 'Somehow, though, your adventure does not end here. Instead, you are whisked back home via some magical force, a bit worse for the weary and somewhat poorer, but ALIVE!'.colorize(:yellow)
+      puts 'Somehow, though, your adventure does not end here!'.colorize(:yellow)
+      puts 'Instead, you are whisked back home via some magical force.'.colorize(:yellow)
+      puts 'A bit worse for the weary and somewhat poorer, but you are ALIVE!'.colorize(:yellow)
       world.player.hp_cur = 1
       world.player.rox -= (world.player.rox * 0.1).to_i
       if world.player.rox < 0

data/lib/gemwarrior/game.rb

@@ -3,7 +3,6 @@
 
 require 'colorize'
 require 'matrext'
-require 'feep'
 
 require_relative 'entities/player'
 require_relative 'entities/items/herb'

data/lib/gemwarrior/misc/music.rb

@@ -1,34 +1,28 @@
 # lib/gemwarrior/misc/music.rb
 # Music cue
 
+require 'win32/sound'
+include Win32
+
+require_relative 'musical_notes'
+
 module Gemwarrior
-  module Music
+  module Music  
     def self.cue(sequence)
-      defaults = {
-        :freq_or_note => 440, 
-        :waveform     => 'saw', 
-        :volume       => 0.3, 
-        :duration     => 500,
-        :notext       => true
-      }
-
-      Thread.start {
-        sequence.each do |note|
-          note_to_play  = note[:freq_or_note]
-          waveform      = note[:waveform].nil? ? defaults[:waveform] : note[:waveform]
-          volume        = note[:volume].nil? ? defaults[:volume] : note[:volume]
-          duration      = note[:duration].nil? ? defaults[:duration] : note[:duration]
-          notext        = note[:notext].nil? ? defaults[:notext] : note[:notext]
+      if OS.windows?
+        threads = []
 
-          Feep::Base.new({
-            :freq_or_note => note_to_play, 
-            :waveform     => waveform, 
-            :volume       => volume, 
-            :duration     => duration,
-            :notext       => notext
-          })
-        end
-      }
+        Thread.start {
+          sequence.each do |seq|
+            seq[:frequencies].split(',').each do |note|
+              threads << Thread.new {
+                Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], 0.1)
+              }
+            end
+            threads.each { |th| th.join }
+          end
+        }
+      end
     end
   end
 end

data/lib/gemwarrior/misc/music_exp.rb

@@ -0,0 +1,34 @@
+# lib/gemwarrior/misc/music.rb
+# Music cue
+
+module Gemwarrior
+  module Music
+    def self.cue(sequence)
+      defaults = {
+        :freq_or_note => 440, 
+        :waveform     => 'saw', 
+        :volume       => 0.3, 
+        :duration     => 500,
+        :notext       => true
+      }
+
+      Thread.start {
+        sequence.each do |note|
+          note_to_play  = note[:freq_or_note]
+          waveform      = note[:waveform].nil? ? defaults[:waveform] : note[:waveform]
+          volume        = note[:volume].nil? ? defaults[:volume] : note[:volume]
+          duration      = note[:duration].nil? ? defaults[:duration] : note[:duration]
+          notext        = note[:notext].nil? ? defaults[:notext] : note[:notext]
+
+          Feep::Base.new({
+            :freq_or_note => note_to_play, 
+            :waveform     => waveform, 
+            :volume       => volume, 
+            :duration     => duration,
+            :notext       => notext
+          })
+        end
+      }
+    end
+  end
+end

data/lib/gemwarrior/misc/musical_notes.rb

@@ -0,0 +1,179 @@
+# lib/gemwarrior/misc/musical_notes.rb
+# Musical note->freq hash
+
+module Gemwarrior
+  module Notes
+    NOTE_FREQ = Hash[
+      'C0'  =>    16.351,
+      'C#0' =>    17.324,
+      'Db0' =>    17.324,
+      'D0'  =>    18.354,
+      'D#0' =>    19.445,
+      'Eb0' =>    19.445,
+      'E0'  =>    20.601,
+      'F0'  =>    21.827,
+      'F#0' =>    23.124,
+      'Gb0' =>    23.124,
+      'G0'  =>    24.499,
+      'G#0' =>    25.956,
+      'Ab0' =>    25.956,
+      'A0'  =>    27.500,
+      'A#0' =>    29.135,
+      'Bb0' =>    29.135,
+      'B0'  =>    30.868,
+      'C1'  =>    32.703,
+      'C#1' =>    34.648,
+      'Db1' =>    34.648,
+      'D1'  =>    36.708,
+      'D#1' =>    38.891,
+      'Eb1' =>    38.891,
+      'E1'  =>    41.203,
+      'F1'  =>    43.654,
+      'F#1' =>    46.249,
+      'Gb1' =>    46.249,
+      'G1'  =>    48.999,
+      'G#1' =>    51.913,
+      'Ab1' =>    51.913,
+      'A1'  =>    55.000,
+      'A#1' =>    58.270,
+      'Bb1' =>    58.270,
+      'B1'  =>    61.375,
+      'C2'  =>    65.406,
+      'C#2' =>    69.296,
+      'Db2' =>    69.296,
+      'D2'  =>    73.416,
+      'D#2' =>    77.782,
+      'Eb2' =>    77.782,
+      'E2'  =>    82.407,
+      'F2'  =>    87.307,
+      'F#2' =>    92.499,
+      'Gb2' =>    92.499,
+      'G2'  =>    97.999,
+      'G#2' =>    97.999,
+      'Ab2' =>   103.826,
+      'A2'  =>   110.000,
+      'A#2' =>   116.541,
+      'Bb2' =>   116.541,
+      'B2'  =>   123.471,
+      'C3'  =>   130.813,
+      'C#3' =>   138.591,
+      'Db3' =>   138.591,
+      'D3'  =>   146.832,
+      'D#3' =>   155.564,
+      'Eb3' =>   155.564,
+      'E3'  =>   164.814,
+      'F3'  =>   174.614,
+      'F#3' =>   184.997,
+      'Gb3' =>   184.997,
+      'G3'  =>   195.998,
+      'G#3' =>   207.652,
+      'Ab3' =>   207.652,
+      'A3'  =>   220.000,
+      'A#3' =>   233.082,
+      'Bb3' =>   233.082,
+      'B3'  =>   246.942,
+      'C4'  =>   261.626,
+      'C#4' =>   277.183,
+      'Db4' =>   277.183,
+      'D4'  =>   293.665,
+      'D#4' =>   311.127,
+      'Eb4' =>   311.127,
+      'E4'  =>   329.628,
+      'F4'  =>   349.228,
+      'F#4' =>   369.994,
+      'Gb4' =>   369.994,
+      'G4'  =>   391.995,
+      'G#4' =>   415.305,
+      'Ab4' =>   415.305,
+      'A4'  =>   440.000,
+      'A#4' =>   466.164,
+      'Bb4' =>   466.164,
+      'B4'  =>   493.883,
+      'C5'  =>   523.251,
+      'C#5' =>   554.365,
+      'Db5' =>   554.365,
+      'D5'  =>   587.330,
+      'D#5' =>   622.254,
+      'Eb5' =>   622.254,
+      'E5'  =>   659.255,
+      'F5'  =>   698.457,
+      'F#5' =>   739.989,
+      'Gb5' =>   739.989,
+      'G5'  =>   783.991,
+      'G#5' =>   830.609,
+      'Ab5' =>   830.609,
+      'A5'  =>   880.000,
+      'A#5' =>   932.328,
+      'Bb5' =>   932.328,
+      'B5'  =>   987.767,
+      'C6'  =>  1046.502,
+      'C#6' =>  1108.731,
+      'Db6' =>  1108.731,
+      'D6'  =>  1174.659,
+      'D#6' =>  1244.508,
+      'Eb6' =>  1244.508,
+      'E6'  =>  1318.510,
+      'F6'  =>  1396.913,
+      'F#6' =>  1479.978,
+      'Gb6' =>  1479.978,
+      'G6'  =>  1567.982,
+      'G#6' =>  1661.219,
+      'Ab6' =>  1661.219,
+      'A6'  =>  1760.000,
+      'A#6' =>  1864.655,
+      'Bb6' =>  1864.655,
+      'B6'  =>  1975.533,
+      'C7'  =>  2093.005,
+      'C#7' =>  2217.461,
+      'Db7' =>  2217.461,
+      'D7'  =>  2349.318,
+      'D#7' =>  2489.016,
+      'Eb7' =>  2489.016,
+      'E7'  =>  2637.021,
+      'F7'  =>  2793.826,
+      'F#7' =>  2959.956,
+      'Gb7' =>  2959.956,
+      'G7'  =>  3135.964,
+      'G#7' =>  3322.438,
+      'Ab7' =>  3322.438,
+      'A7'  =>  3520.000,
+      'A#7' =>  3729.310,
+      'Bb7' =>  3729.310,
+      'B7'  =>  3951.066,
+      'C8'  =>  4186.009,
+      'C#8' =>  4434.922,
+      'Db8' =>  4434.922,
+      'D8'  =>  4698.636,
+      'D#8' =>  4978.032,
+      'Eb8' =>  4978.032,
+      'E8'  =>  5274.042,
+      'F8'  =>  5587.652,
+      'F#8' =>  5919.910,
+      'Gb8' =>  5919.910,
+      'G8'  =>  6271.928,
+      'G#8' =>  6644.876,
+      'Ab8' =>  6644.876,
+      'A8'  =>  7040.000,
+      'A#8' =>  7458.620,
+      'Bb8' =>  7458.620,
+      'B8'  =>  7902.132,
+      'C9'  =>  8372.018,
+      'C#9' =>  8869.844,
+      'Db9' =>  8869.844,
+      'D9'  =>  9397.272,
+      'D#9' =>  9956.064,
+      'Eb9' =>  9956.064,
+      'E9'  => 10548.084,
+      'F9'  => 11175.304,
+      'F#9' => 11839.820,
+      'Gb9' => 11839.820,
+      'G9'  => 12543.856,
+      'G#9' => 13289.752,
+      'Ab9' => 13289.752,
+      'A9'  => 14080.000,
+      'A#9' => 14917.240,
+      'Bb9' => 14917.240,
+      'B9'  => 15804.264
+    ]
+  end
+end

data/lib/gemwarrior/repl.rb

@@ -80,12 +80,6 @@ module Gemwarrior
     end
 
     def print_logo
-      if world.sound
-        Music::cue([
-          {:freq_or_note => 'A3,E4,C#5,F#5', :duration => 1000}
-        ])
-      end
-
       puts '/-+-+-+ +-+-+-+-+-+-+-\\'.colorize(:yellow)
       puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
       puts '\\-+-+-+ +-+-+-+-+-+-+-/'.colorize(:yellow)
@@ -224,6 +218,12 @@ module Gemwarrior
       case choice
       when 'n'
         clear_screen
+        if world.sound
+          Music::cue([
+            {:frequencies => 'A3,E4,C#5,E5', :duration => 300},
+            {:frequencies => 'A3,E4,C#5,F#5', :duration => 600}
+          ])
+        end
         print_splash_message
         print_fortune
         return

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.24
 platform: ruby
 authors:
 - Michael Chadwick
@@ -101,19 +101,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: feep
+  name: win32-sound
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +275,8 @@ files:
 - lib/gemwarrior/misc/animation.rb
 - lib/gemwarrior/misc/formatting.rb
 - lib/gemwarrior/misc/music.rb
+- lib/gemwarrior/misc/music_exp.rb
+- lib/gemwarrior/misc/musical_notes.rb
 - lib/gemwarrior/misc/name_generator.rb
 - lib/gemwarrior/misc/player_levels.rb
 - lib/gemwarrior/misc/timer.rb