gemwarrior 0.15.16 → 0.15.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af41531f83649ddfdb29e63eb5dd8dabf1da21c4cae9874a3a531fa4559c3c22
-  data.tar.gz: e1249f0aec95bfabd4a8ef0e69a645bee74da5db6ce9d60aaea2bd0dae556bee
+  metadata.gz: b21fc1bd7f24fd89ea21249fc371813f8402a090114faea12335b91c28bd6d5f
+  data.tar.gz: 2ceaab667e6229e20feab0c5a25fb04786bd8ca9178bcf51376e89f9709fc492
 SHA512:
-  metadata.gz: e118be36f9aa2ecbd5c22f79ac098d71f672341652ca0e92e7755ce5ca3a09f45504707607a070eec0632f36b1cfaa553d82f15d98a97b03d9c14ba8ed24874a
-  data.tar.gz: c77c150026e63e7ba0d8d7de76513baf01ccc6f7b5b3bfb6b6a0ccd545e72e33008ff662ea2c56be1c86dda64d1c8adebd71f69ac1dd12d5559d25f17b79c3c6
+  metadata.gz: c8d2531c9c2ad46dd10835502eba47ad1a80244a1e1f593e80adea0afdb92f279b83715c6bd58d320e3c68eb3f5b16ad5e7e861b4363792dddc5ef2b7d8f63cd
+  data.tar.gz: 4b266ac1ed49b04ec8a61bd646e31bce83d3f8070bb880174cdf8f27966c53e9945d54ba064d32dfa3ff5234c60a665758b04272d76269598dfc5a88eee086d8

data/gemwarrior.gemspec

@@ -34,13 +34,16 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'matrext', '~> 1.0'
   spec.add_runtime_dependency 'os', '~> 0.9', '>= 0.9.6'
   spec.add_runtime_dependency 'psych', '~> 5.1'
-    ## 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'
+
+  ## sound systems
+  # spec.add_runtime_dependency 'bloopsaphone', '>= 0.4'
+  # spec.add_runtime_dependency 'feep', '~> 0.1.3'
+  # spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
+
   # spec.platform             = Gem::Platform::RUBY
   spec.post_install_message   = "Type 'gemwarrior' to start adventuring!"
   # spec.require_paths        = ['lib']
+
   ## development deps
   spec.add_development_dependency 'awesome_print', '~> 1.9'
   spec.add_development_dependency 'bundler', '~> 2.4'

data/lib/gemwarrior/game.rb

@@ -49,7 +49,10 @@ module Gemwarrior
       # create new world based on yaml/marshall data
       self.world                    = init_world
 
-      # update some player aspects to make more dynamic
+      # spawn bosses inside world
+      self.init_bosses
+
+      # update some aspects of world's player to make more dynamic
       self.world.player.name        = world.player.generate_name
       self.world.player.face        = world.player.generate_face
       self.world.player.hands       = world.player.generate_hands
@@ -63,9 +66,6 @@ module Gemwarrior
       self.world.shifty_to_jewel    = false
       self.world.shifty_has_jeweled = false
 
-      # # spawn bosses
-      self.init_bosses
-
       # mark home as visited
       self.world.location_by_name('home').visited = true
 

data/lib/gemwarrior/misc/audio.rb

@@ -8,7 +8,11 @@ require_relative '../game_options'
 module Gemwarrior
   module Audio
     # CONSTANTS
-    ERROR_SOUND_NOT_ENABLED = 'Sound is disabled! Enable in main options to hear sound.'
+    ERROR_SOUND_NOT_ENABLED       = 'Sound is disabled! Enable in main options to hear sound.'
+    ERROR_SOUND_SYSTEM_NOT_CHOSEN = 'Sound system not chosen! Choose one in main options to hear sound.'
+    ERROR_BLOOPS_NOT_FOUND        = 'bloopsaphone gem not found. Try \'gem install bloopsaphone\'.'
+    ERROR_FEEP_NOT_FOUND          = 'feep gem not found. Try \'gem install feep\'.'
+    ERROR_WIN32_NOT_FOUND         = 'win32-sound gem not found. Try \'gem install win32-sound\'.'
 
     def self.init
       if GameOptions.data['sound_system'].eql?('win32-sound')
@@ -49,76 +53,92 @@ module Gemwarrior
 
     def self.play_synth(audio_cue_symbol)
       if GameOptions.data['sound_enabled']
-        case GameOptions.data['sound_system']
-        when 'win32-sound'
-          require_relative 'audio_cues'
-          require_relative 'musical_notes'
+        if GameOptions.data['sound_system']
+          case GameOptions.data['sound_system']
+          when 'win32-sound'
+            if system('gem list -ie win32-sound')
+              require_relative 'audio_cues'
+              require_relative 'musical_notes'
 
-          if AudioCues.cues[audio_cue_symbol]
-            Thread.start do
-              AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
-                threads = []
-                seq[:frequencies].split(',').each do |note|
-                  threads << Thread.new do
-                    Win32::Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], GameOptions.data['sound_volume'])
+              if AudioCues.cues[audio_cue_symbol]
+                Thread.start do
+                  AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
+                    threads = []
+                    seq[:frequencies].split(',').each do |note|
+                      threads << Thread.new do
+                        Win32::Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], GameOptions.data['sound_volume'])
+                      end
+                    end
+                    threads.each { |th| th.join }
                   end
                 end
-                threads.each { |th| th.join }
               end
+            else
+              GameOptions.data['errors'] = ERROR_WIN32_NOT_FOUND
             end
-          end
-        when 'feep'
-          require_relative 'audio_cues'
+          when 'feep'
+            if system('gem list -ie feep')
+              require_relative 'audio_cues'
 
-          feep_defaults = {
-            frequencies:  '440',
-            waveform:     'sine',
-            volume:       GameOptions.data['sound_volume'],
-            duration:     500,
-            notext:       true
-          }
+              feep_defaults = {
+                frequencies:  '440',
+                waveform:     'sine',
+                volume:       GameOptions.data['sound_volume'],
+                duration:     500,
+                notext:       true
+              }
 
-          if AudioCues.cues[audio_cue_symbol]
-            Thread.start do
-              AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
-                seq = feep_defaults.merge(seq)
+              if AudioCues.cues[audio_cue_symbol]
+                Thread.start do
+                  AudioCues.cues[audio_cue_symbol][:synth].each do |seq|
+                    seq = feep_defaults.merge(seq)
 
-                Feep::Base.new({
-                  freq_or_note: seq[:frequencies],
-                  waveform:     seq[:waveform],
-                  volume:       seq[:volume],
-                  duration:     seq[:duration],
-                  notext:       seq[:notext]
-                })
+                    Feep::Base.new({
+                      freq_or_note: seq[:frequencies],
+                      waveform:     seq[:waveform],
+                      volume:       seq[:volume],
+                      duration:     seq[:duration],
+                      notext:       seq[:notext]
+                    })
+                  end
+                end
               end
+            else
+              GameOptions.data['errors'] = ERROR_FEEP_NOT_FOUND
             end
-          end
-        when 'bloops'
-          require_relative 'bloops_cues'
+          when 'bloops'
+            if system('gem list -ie bloops')
+              require_relative 'bloops_cues'
 
-          if BloopsCues.cues[audio_cue_symbol]
-            Thread.start do
-              BloopsCues.cues[audio_cue_symbol][:synth].each do |seq|
-                threads = []
+              if BloopsCues.cues[audio_cue_symbol]
+                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?
+                    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
-
-                threads.each { |th| th.join }
               end
+            else
+              GameOptions.data['errors'] = ERROR_BLOOPS_NOT_FOUND
             end
           end
+        else
+          GameOptions.data['errors'] = ERROR_SOUND_SYSTEM_NOT_CHOSEN
         end
       else
         GameOptions.data['errors'] = ERROR_SOUND_NOT_ENABLED

data/lib/gemwarrior/repl.rb

@@ -255,17 +255,21 @@ module Gemwarrior
         if OS.windows?
           puts answer
           GameOptions.add 'sound_system', 'win32-sound'
+          Audio.init
         else
-          puts
+          puts answer
+          puts "Sorry, but your system doesn't seem to be running Windows."
         end
         print_options_sound_sytem
       when '2'
         puts answer
         GameOptions.add 'sound_system', 'feep'
+        Audio.init
         print_options_sound_sytem
       when '3'
         puts answer
         GameOptions.add 'sound_system', 'bloops'
+        Audio.init
         print_options_sound_sytem
       when 't'
         puts answer
@@ -304,6 +308,9 @@ module Gemwarrior
       when '1'
         print answer
         GameOptions.data['sound_enabled'] = !GameOptions.data['sound_enabled']
+        if GameOptions.data['sound_enabled']
+          Audio.init
+        end
         print_options
       when '2'
         print answer

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.15.16
+  version: 0.15.17
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocker