gemwarrior 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2116e67dae88fd5d7ed8aaf66aa3893c4f400ea9
-  data.tar.gz: 028aaabc8fffe0f2732abf2d8103dd6e0c0c5cab
+  metadata.gz: 9eed4c481dd9b8c403851ed62c05ea92757f56d7
+  data.tar.gz: b2d8cbfee1c8dac0daed910d8436970e8cdab12a
 SHA512:
-  metadata.gz: baa12d9a3195ea0c9ea48e025d0f6bf89028eab69e7eb174d5c04b520a8bfe216732bde1acaf0df750f5f1ea1f23fd128db92e7becf543a65ab8487a7d1cebac
-  data.tar.gz: bf58ddec9f4cbca65ad6230ebdc6c96a25b9b0ac0e7ce54aaf63c15f428d2154e8253cc75ecb0725c89943387daaf196d8b207c33b70248eab617d60e067cd2c
+  metadata.gz: 2c9168749c94929d96c7175698a90f44c393846d45d7d5d9d2000ac20fe077adf1305ddecbe46b6b7a24a47f5a552363720c7f4ee7d8c306e9c2f98396a70110
+  data.tar.gz: 7c7e3eb9aab5d32d8f20ef14577935ba3d4aa69666fbb6c28a64262b0fc6baf77f6e3d91e7a08764e8fa924651c010d5bb6a2ca97c57cf9f63ad239b5492d76c

data/bin/gemwarrior

@@ -117,7 +117,7 @@ end
 def init_config
   Dir.mkdir(GW_HOME) unless Dir.exist?(GW_HOME)
 
-  sound_system_default = OS.windows? ? 'win32-sound' : 'feep'
+  sound_system_default = OS.windows? ? 'win32-sound' : 'bloops'
   
   GameOptions.add 'sound_system',             sound_system_default
   GameOptions.add 'save_file_mode',           'Y'

data/gemwarrior.gemspec

@@ -25,19 +25,16 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.7.7'
   spec.add_runtime_dependency 'matrext', '~> 0.4.10'
   spec.add_runtime_dependency 'clocker', '~> 0.1.6'
-  spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
-  spec.add_runtime_dependency 'feep', '~> 0.1.3'
   spec.add_runtime_dependency 'gems', '~> 0.8.3'
-
-  # gems for future features
-  # spec.add_runtime_dependency 'hr', '~> 0.0.2'
-  # spec.add_runtime_dependency 'github_api', '~> 0.12.4'
+  
+  # sound systems
+  #spec.add_runtime_dependency 'feep', '~> 0.1.3'
+  #spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
+  #spec.add_runtime_dependency 'bloopsaphone', '>= 0.4'
   
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
-  
   spec.add_development_dependency 'rubocop', '~> 0.29'
-
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-nc'
   spec.add_development_dependency 'guard'

data/lib/gemwarrior/battle.rb

@@ -541,7 +541,6 @@ module Gemwarrior
     end
 
     def monster_death
-      Audio.play_synth(:battle_win)
       puts "  YOU HAVE DEFEATED #{monster.name.upcase}!\n".colorize(:green)
 
       if monster.is_boss
@@ -557,6 +556,8 @@ module Gemwarrior
           # game ending: initiate
           return monster.initiate_ending(world)
         elsif monster.name.eql?('jaspern')
+          Audio.play_synth(:battle_win_boss)
+
           puts '  You just beat a MINIBOSS! Fantastic!'
           puts
 
@@ -565,11 +566,15 @@ module Gemwarrior
           # river bridge boss: initiate
           return monster.river_bridge_success(world)
         else
+          Audio.play_synth(:battle_win_boss)
+
           reward_player(monster)
 
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
+        Audio.play_synth(:battle_win_monster)
+
         # stats
         world.player.monsters_killed += 1
 

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

@@ -33,6 +33,7 @@ module Gemwarrior
 
           case answer
           when 'mineral'
+            Audio.play_synth(:uncover_secret)
             forest_southwest.paths[:west] = true
             puts
             Animation.run(phrase: OPEN_TEXT)

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

@@ -16,6 +16,7 @@ module Gemwarrior
     def use(world)
       puts 'You attempt to open the seriously massive door that separates you from Emerald himself.'
       if world.player.inventory.contains_item?('keystone')
+        Audio.play_synth(:uncover_secret)
         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

@@ -93,6 +93,7 @@ module Gemwarrior
           end   
       
           if pedestal_configured
+            Audio.play_synth(:uncover_secret)
             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

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

@@ -20,6 +20,7 @@ module Gemwarrior
       puts 'You gently place your fingers on the pond\'s rippling surface.'
 
       if (NEEDED_ITEMS - world.player.inventory.items.map(&:name)).empty?
+        Audio.play_synth(:uncover_secret)
         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' }

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

@@ -17,6 +17,7 @@ module Gemwarrior
       if !self.used
         self.used = true
 
+        Audio.play_synth(:uncover_secret)
         puts 'You lower yourself to the ground and attempt to peer in the hole in the wall. Just as you begin to think this is a fruitless endeavor, a pair of bright, beady eyes manifest, and an unexpectedly low voice speaks:'
         Person.new.speak('Hello. I\'m Rockney, of Rockney\'s Hole in the Wall. Pleasure!')
 

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

@@ -20,7 +20,9 @@ module Gemwarrior
         return { type: nil, data: nil }
       elsif self.used
         self.used_again = true
-        
+
+        Audio.play_synth(:uncover_secret)
+
         puts 'Looking further into the small opening in the trunk your eye catches the light glinting off a few small metallic objects.'
 
         cur_loc = world.location_by_name('forest-southeast')

data/lib/gemwarrior/game.rb

@@ -88,6 +88,11 @@ module Gemwarrior
       # create options file if not existing
       update_options_file
 
+      # require needed files for selected sound_system if sound_enabled
+      if GameOptions.data['sound_enabled']
+        Audio.init
+      end
+
       # create the console
       self.evaluator  = Evaluator.new(world)
       self.repl       = Repl.new(self, world, evaluator)

data/lib/gemwarrior/misc/audio.rb

@@ -1,25 +1,40 @@
 # lib/gemwarrior/misc/audio.rb
 # Audio cues using either synth or samples
-# Synth: win32-sound or feep, depending on platform
+# Synth: win32-sound, feep, or bloopsaphone depending on platform/choice
 # Samples: small wav files
 
 require_relative '../game_options'
-require_relative 'audio_cues'
-require_relative 'musical_notes'
 
 module Gemwarrior
   module Audio
-    def self.play_sample(audio_cue_symbol)
-      # future use
+    def self.init
+      if GameOptions.data['sound_system'].eql?('win32-sound')
+        begin
+          require 'win32/sound'
+        rescue LoadError => e
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Gem Warrior will be silent for now."
+        end
+      elsif GameOptions.data['sound_system'].eql?('feep')
+        begin
+          require 'feep'
+        rescue LoadError => e
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Gem Warrior will be silent for now."
+        end
+      elsif GameOptions.data['sound_system'].eql?('bloops')
+        begin
+          require 'bloops'
+        rescue LoadError => e
+          GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}aphone'. Gem Warrior will be silent for now."
+        end
+      end
     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'
+        case GameOptions.data['sound_system']
+        when 'win32-sound'
+          require_relative 'audio_cues'
           require_relative 'musical_notes'
-
           Thread.start do
             AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
               threads = []
@@ -31,10 +46,8 @@ module Gemwarrior
               threads.each { |th| th.join }
             end
           end
-        # otherwise, use inferior feep library
-        elsif GameOptions.data['sound_system'].eql?('feep')
-          require 'feep'
-
+        when 'feep'
+          require_relative 'audio_cues'
           feep_defaults = {
             frequencies:  '440',
             waveform:     'sine',
@@ -42,7 +55,7 @@ module Gemwarrior
             duration:     500,
             notext:       true
           }
-      
+
           Thread.start do
             AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
               seq = feep_defaults.merge(seq)
@@ -56,8 +69,35 @@ module Gemwarrior
               })
             end
           end
+        when 'bloops'
+          require_relative 'bloops_cues'
+          Thread.start do
+            BloopsCues.cues[audio_cue_symbol][:synth].each do |seq|
+              threads = []
+
+              seq.each do |note|
+                threads << Thread.new do
+                  b = Bloops.new
+                  b.tempo = 240
+                  snd = b.sound Bloops::SQUARE
+                  snd.punch = GameOptions.data['sound_volume']/2
+                  snd.sustain = 0.7
+                  snd.decay = 0.2
+                  b.tune snd, note[1]
+                  b.play
+                  sleep 0.1 while !b.stopped?
+                end
+              end
+
+              threads.each { |th| th.join }
+            end
+          end
         end
       end
     end
+
+    def self.play_sample(audio_cue_symbol)
+      # future use
+    end
   end
 end

data/lib/gemwarrior/misc/audio_cues.rb

@@ -93,13 +93,11 @@ module Gemwarrior
 
     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 }
+        { frequencies: 'C3,G4',  duration: 50 },
+        { frequencies: 'D3,A4',  duration: 50 },
+        { frequencies: 'E3,B4',  duration: 50 },
+        { frequencies: 'F3,C5',  duration: 50 },
+        { frequencies: 'G3,B4,D5',  duration: 350 }
       ],
       sample: 'intro.wav'
     }
@@ -131,6 +129,19 @@ module Gemwarrior
       sample: 'player_travel.wav'
     }
 
+    self.add :uncover_secret, {
+      synth: [
+        { frequencies: 'F5', duration: 150 },
+        { frequencies: 'E5', duration: 150 },
+        { frequencies: 'C#4', duration: 150 },
+        { frequencies: 'C4', duration: 150 },
+        { frequencies: 'D#5', duration: 150 },
+        { frequencies: 'F#5', duration: 150 },
+        { frequencies: 'A5', duration: 150 }
+      ],
+      sample: 'uncover_secret.wav'
+    }
+
     self.add :win_game, {
       synth: [
         { frequencies: 'G3',  duration: 250 },

data/lib/gemwarrior/misc/bloops_cues.rb

@@ -0,0 +1,166 @@
+# lib/gemwarrior/misc/bloops_cues.rb
+# Bloops cue symbol -> notes/wav_file
+
+module Gemwarrior
+  module BloopsCues
+    def self.add key, val
+      @@cues ||= {}
+      @@cues[key] = val
+    end
+    
+    def self.cues
+      @@cues ||= {}
+    end
+
+    self.add :bg1, {
+      synth: [
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:G4' },
+        { s1: '2:A4' },
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:C4' },
+        { s1: '2:C5' },
+        { s1: '2:B4' },
+        { s1: '2:A4' },
+      ],
+      sample: 'bg1.wav'
+    }
+    
+    self.add :battle_start, {
+      synth: [
+        { s1: '16:G4' },
+        { s1: '16:G#4' },
+        { s1: '16:G4' },
+        { s1: '16:G#4' },
+        { s1: '16:G4' },
+        { s1: '16:G#4' }
+      ],
+      sample: 'battle_start.wav'
+    }
+
+    self.add :battle_player_attack, {
+      synth: [{ s1: '16:A4', s2: '16:E4', s3: '16:B5' }],
+      sample: 'battle_player_attack.wav'
+    }
+
+    self.add :battle_player_miss, {
+      synth: [{ s1: '8:A4' }],
+      sample: 'battle_player_miss.wav'
+    }
+
+    self.add :battle_monster_attack, {
+      synth: [{ s1: '16:B4', s2: '16:E#5', s3: '16:A5' }],
+      sample: 'battle_monster_attack.wav'
+    }
+
+    self.add :battle_monster_miss, {
+      synth: [{ s1: '8:B4' }],
+      sample: 'battle_monster_miss.wav'
+    }
+
+    self.add :battle_win_boss, {
+      synth: [
+        { s1: '16:E5' },
+        { s1: '16:F5' },
+        { s1: '8:E5' },
+        { s1: '16:E5' },
+        { s1: '16:F5' },
+        { s1: '8:E5' },
+        { s1: '16:E4', s2: '16:A4' },
+        { s1: '4:E4',  s2: '4:A4' }
+      ],
+      sample: 'battle_win_boss.wav'
+    }
+
+    self.add :battle_win_monster, {
+      synth: [
+        { s1: '16:D5' },
+        { s1: '16:E5' },
+        { s1: '8:D5' },
+        { s1: '16:D4' },
+        { s1: '4:D4' }
+      ],
+      sample: 'battle_win_monster.wav'
+    }
+
+    self.add :intro, {
+      synth: [
+        { s1: '16:C3', s2: '16:G4' },
+        { s1: '16:D3', s2: '16:A4' },
+        { s1: '16:E3', s2: '16:B4' },
+        { s1: '16:F3', s2: '16:C5' },
+        { s1: '4:G3', s2: '4:B4', s3: '4:D5' }
+      ],
+      sample: 'intro.wav'
+    }
+    
+    self.add :player_level_up, {
+      synth: [
+        { s1: '8:D4', s2: '8:A4', s3: '8:D5', s4: '8:A5', s5: '8:D6' },
+        { s1: '4:D4', s2: '4:A4', s3: '4:D5', s4: '4:A5', s5: '4:D6' },
+        { s1: '1:E4', s2: '1:B4', s3: '1:E5', s4: '1:B5', s5: '1:E6' }
+      ]
+    }
+
+    self.add :player_resurrection, {
+      synth: [
+        { s1: '16:D#5' },
+        { s1: '14:A4' },
+        { s1: '12:F#4' },
+        { s1: '2:F4' }
+      ],
+      sample: 'player_resurrection.wav'
+    }
+
+    self.add :player_travel, {
+      synth: [
+        { s1: '16:C4' },
+        { s1: '16:D4' },
+        { s1: '16:E4' }
+      ],
+      sample: 'player_travel.wav'
+    }
+
+    self.add :uncover_secret, {
+      synth: [
+        { s1: '8:F5' },
+        { s1: '8:E5' },
+        { s1: '8:C#4' },
+        { s1: '8:C4' },
+        { s1: '8:D#5' },
+        { s1: '8:F#5' },
+        { s1: '8:A5' }
+      ],
+      sample: 'uncover_secret.wav'
+    }
+
+    self.add :win_game, {
+      synth: [
+        { s1: '4:G3' },
+        { s1: '16:A3' },
+        { s1: '16:B3' },
+        { s1: '16:C4' },
+        { s1: '4:D4' },
+        { s1: '16:E4' },
+        { s1: '16:F#4' },
+        { s1: '16:G4' },
+        { s1: '4:A4' },
+        { s1: '16:B4' },
+        { s1: '16:C5' },
+        { s1: '16:D5' },
+        { s1: '16:E5' },
+        { s1: '16:F#5' },
+        { s1: '1:G5' }
+      ],
+      sample: 'win_game.wav'
+    }
+  end
+end

data/lib/gemwarrior/repl.rb

@@ -203,9 +203,17 @@ module Gemwarrior
       print ' (2) FEEP        '
       print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('feep')
       print "\n"
+      print ' (3) BLOOPS      '
+      print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('bloops')
+      print "\n"
+      puts
+      puts ' WIN32-SOUND : good quality; Windows-only'
+      puts ' FEEP        : cross-platform; VERY SLOW and BUGGY'
+      puts ' BLOOPS      : cross-platform; requires portaudio'
       puts
-      puts 'Note: WIN32-SOUND is Windows-only, and will break the game if sound is enabled on non-Windows machines.'
-      puts 'Note: FEEP is cross-platform, but VERY SLOW and BUGGY, so use at your discretion!'
+      puts ' NOTE: none of these are required dependencies anymore, as sound is optional.'
+      puts ' If you do not have the one selected installed on your machine, you will get '
+      puts ' an error on game load, and no sound will be heard.'
       puts
       puts '================================='.colorize(:yellow)
       puts
@@ -221,6 +229,9 @@ module Gemwarrior
       when '2'
         GameOptions.add 'sound_system', 'feep'
         print_options_sound_sytem
+      when '3'
+        GameOptions.add 'sound_system', 'bloops'
+        print_options_sound_sytem
       else
         return
       end
@@ -493,6 +504,7 @@ module Gemwarrior
 
       # main menu loop until new game or exit
       if new_skip
+        print_errors
         play_intro_tune
         print_splash_message
         print_fortune
@@ -501,6 +513,7 @@ module Gemwarrior
         if result.nil?
           run_main_menu
         else
+          print_errors
           self.world = result
           self.evaluator = Evaluator.new(self.world)
         end
@@ -513,6 +526,12 @@ module Gemwarrior
       puts evaluator.parse(extra_command) unless extra_command.nil?
     end
 
+    def print_errors
+      if GameOptions.data['errors']
+        puts GameOptions.data['errors'].colorize(:red)
+      end
+    end
+
     def play_intro_tune
       Audio.play_synth(:intro)
     end

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -100,34 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: win32-sound
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: feep
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: gems
   requirement: !ruby/object:Gem::Requirement
@@ -354,6 +326,7 @@ files:
 - lib/gemwarrior/misc/animation.rb
 - lib/gemwarrior/misc/audio.rb
 - lib/gemwarrior/misc/audio_cues.rb
+- lib/gemwarrior/misc/bloops_cues.rb
 - lib/gemwarrior/misc/formatting.rb
 - lib/gemwarrior/misc/hr.rb
 - lib/gemwarrior/misc/musical_notes.rb