gemwarrior 0.9.24 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a1b18616466767287b7ffa529ea5601c8fc44b
-  data.tar.gz: 18b96dfb87948ec1aae7b6dcc689ca61473ccf7d
+  metadata.gz: 107f1e7b40ef5dee781180e7ffbb1add6696bf29
+  data.tar.gz: 3915864403a1d5969daecc7da9e89b691acfe9bf
 SHA512:
-  metadata.gz: 76d1391273ec80e83ed990557c69f7906a25b94a258a0d30ccc5f017dfb293ecb88ac37400ab9e59e34e0fdf9cb3ca57ca4163a950dfffa0b1f9493a2d3bdab5
-  data.tar.gz: e36826f4e67b5e6c171d9456429f95d7b8b98d6d562cb1f76e887dddacda65dcfba9dfda7fe35091a283a9fe945273c1cb14bcd42b79fe8d78f9552bf7a2bd1f
+  metadata.gz: 2aa48bb8109a9264b5472d311a8fddd3666da3c5f9f2d4181e9ea2201fa5e4501378121f3b70d4b069766da968ca79f9a2cabd83da330f544ccc486df9a65a11
+  data.tar.gz: 5be06f477fe64a1ba59940c3bac72cb84baa0a96763e39ccf8bcdec585842d74bacec7f3f2fca09b4fa956da749432261dbcfa1c1233ce36573a6b3aaab9c977

data/data/locations.yml

@@ -1002,7 +1002,7 @@
 -
   name:                 'Sky Tower (Lounge)'
   description:          'Nothing but a simple couch, which looks very comfortable, exists in this corner of the tower.'
-  danger_level:         :moderate,
+  danger_level:         :moderate
   coords:
     x: 9
     y: 8

data/gemwarrior.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'matrext', '~> 0.4.8'
   spec.add_runtime_dependency 'clocker', '~> 0.1.2'
   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

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

@@ -17,9 +17,13 @@ module Gemwarrior
     end
 
     def use(player = nil)
-      puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat better after getting back up.'
-      puts '>> You regain a hit point.'
-      {:type => 'rest', :data => 1}
+      if player.at_full_hp?
+        puts 'You come to rest on the impossibly soft surface of the furniture, but even after a few minutes of this seemingly heavenly hedonism you don\'t feel significantly better and decide to get up again.'
+      else
+        puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat better after getting back up.'
+        puts '>> You regain a hit point.'
+        {:type => 'rest', :data => 1}
+      end
     end
   end
 end

data/lib/gemwarrior/misc/music.rb

@@ -1,14 +1,15 @@
 # lib/gemwarrior/misc/music.rb
-# Music cue
+# Music cues using win32-sound
 
+require 'feep'
 require 'win32/sound'
-include Win32
 
 require_relative 'musical_notes'
 
 module Gemwarrior
-  module Music  
+  module Music
     def self.cue(sequence)
+      # if Windows, use superior win32-sound library
       if OS.windows?
         threads = []
 
@@ -16,12 +17,35 @@ module Gemwarrior
           sequence.each do |seq|
             seq[:frequencies].split(',').each do |note|
               threads << Thread.new {
-                Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], 0.1)
+                Win32::Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], 0.5)
               }
             end
             threads.each { |th| th.join }
           end
         }
+      # otherwise, use inferior feep library
+      else
+        feep_defaults = {
+          :frequencies  => '440', 
+          :waveform     => 'sine', 
+          :volume       => 0.3, 
+          :duration     => 500,
+          :notext       => true
+        }
+      
+        Thread.start {
+          sequence.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]
+            })
+          end
+        }
       end
     end
   end

data/lib/gemwarrior/repl.rb

@@ -218,12 +218,7 @@ 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
+        play_intro_tune
         print_splash_message
         print_fortune
         return
@@ -291,7 +286,16 @@ module Gemwarrior
         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}
+        ])
+      end
+    end
+    
     def setup_screen(initial_command = nil, extra_command = nil)
       # welcome player to game
       clear_screen
@@ -299,6 +303,7 @@ module Gemwarrior
 
       # main menu loop until new game or exit
       if world.new_game
+        play_intro_tune
         print_splash_message
         print_fortune
       else

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.26
 platform: ruby
 authors:
 - Michael Chadwick
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !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: github_api
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +289,6 @@ 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

data/lib/gemwarrior/misc/music_exp.rb

@@ -1,34 +0,0 @@
-# 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