gemwarrior 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d9ee449614471055090e892a1df42560c7aa007
-  data.tar.gz: 965e2ba208c084fa2a09560264bc2fc93681c85d
+  metadata.gz: b3c563f75f5ead6dc58429b57c95030fe5b13418
+  data.tar.gz: dccefd704798d1a4a3fb8c95c765483b6cda5335
 SHA512:
-  metadata.gz: 13103d68009ab62661164fecacd8f959034078e069ce3e150935fc275659fcab5c7450a4b6496078d092f6da88731205b17301b0a11357e28a2851e41af4d0a5
-  data.tar.gz: 65b36061328f65a994f5e58fb8321a3b9b97e25aa3e5105c580751555aacb03282ad3513a965b3bde0fa662c5021e11460fef3766834b46e29c1a06b74c15cf5
+  metadata.gz: 38d67f40be64e86fee9037aa59aaea3fbe5af4f03a041094a97d3129d2ebd80ea4900a70b91f3d2c3a9192e0b20a3d848eec071159c63d9c6d63368a6ca26758
+  data.tar.gz: c1111660e8ba6251c208804c84c784ca23ac2465b78c015def3978d2fc66afd127ddf77761e0dd482fd4a1b28ccfecabbffdb8f14d07dfe7d53f9c0119928e05

data/bin/gemwarrior

@@ -8,7 +8,7 @@ require_relative '../lib/gemwarrior/game'
 GAME_NAME = "Gem Warrior"
 
 def parse_options
-  options = {:debug_mode => false, :god_mode => false, :beast_mode => false, :use_wordnik => false}
+  options = {:debug_mode => false, :god_mode => false, :beast_mode => false, :use_wordnik => false, :sound => false}
 
   optparse = OptionParser.new do |opts|
     opts.on('-v', '--version', 'Display version number and exit') do
@@ -31,6 +31,10 @@ def parse_options
     opts.on('-w', '--wordnik', 'Use Wordnik to generate more diverse, dynamic descriptors of entities') do
       options[:use_wordnik] = true
     end
+    
+    opts.on('-s', '--sound', 'Turn sound on') do
+      options[:sound] = true
+    end
   end
 
   optparse.parse!()

data/gemwarrior.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.license         = 'MIT'
 
   spec.add_runtime_dependency 'os', '~> 0.9', '>= 0.9.6'
-  spec.add_runtime_dependency 'matrext', '~> 0.4.7'
+  spec.add_runtime_dependency 'matrext', '~> 0.4.8'
   spec.add_runtime_dependency 'http', '~> 0.8.10'
   spec.add_runtime_dependency 'json', '~> 1.8.2'
   spec.add_runtime_dependency 'colorize', '~> 0.7.7'
+  spec.add_runtime_dependency 'feep', '~> 0.1.3'
+  
   #spec.add_runtime_dependency 'hr', '~> 0.0.1'
-
-  #spec.add_runtime_dependency 'feep', '~> 0.1.0'  
   #spec.add_runtime_dependency 'wordnik', '~> 4.12'
 
   spec.add_development_dependency 'pry-byebug', '~> 3.0'

data/lib/gemwarrior/entities/player.rb

@@ -142,7 +142,7 @@ module Gemwarrior
       inventory.list_contents
     end 
 
-    def go(locations, direction)
+    def go(locations, direction, sound)
       case direction
       when 'north', 'n'
         self.cur_coords = {
@@ -173,7 +173,7 @@ module Gemwarrior
         }
         direction_text = '<<<'
       end
-      print_traveling_text(direction_text)
+      print_traveling_text(direction_text, sound)
     end
 
     def attack(world, monster)
@@ -217,8 +217,13 @@ module Gemwarrior
     end
     
     # TRAVEL    
-    def print_traveling_text(direction_text)
+    def print_traveling_text(direction_text, sound)
       Animation::run({:oneline => false, :phrase => "* #{direction_text} *"})
+      if sound
+        Music::cue([
+          {:freq_or_note => 'C3,E3'}
+        ])
+      end
     end
     
     # CHARACTER

data/lib/gemwarrior/evaluator.rb

@@ -347,7 +347,7 @@ module Gemwarrior
         else
           direction = param1
           if world.can_move?(direction)
-            world.player.go(world.locations, param1)
+            world.player.go(world.locations, param1, world.sound)
             world.location_by_coords(world.player.cur_coords).checked_for_monsters = false
             world.describe(world.location_by_coords(world.player.cur_coords))
           else

data/lib/gemwarrior/game.rb

@@ -3,10 +3,12 @@
 
 require 'colorize'
 require 'matrext'
+require 'feep'
 
 require_relative 'entities/player'
 require_relative 'misc/player_levels'
 require_relative 'misc/animation'
+require_relative 'misc/music'
 require_relative 'world'
 require_relative 'evaluator'
 require_relative 'repl'
@@ -32,6 +34,7 @@ module Gemwarrior
       
       world.debug_mode      = options.fetch(:debug_mode)
       world.use_wordnik     = options.fetch(:use_wordnik)
+      world.sound           = options.fetch(:sound)
 
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,

data/lib/gemwarrior/misc/animation.rb

@@ -1,4 +1,4 @@
-# lib/gemwarrior/animation.rb
+# lib/gemwarrior/misc/animation.rb
 # Animation routine
 
 module Gemwarrior

data/lib/gemwarrior/misc/music.rb

@@ -0,0 +1,36 @@
+# lib/gemwarrior/misc/music.rb
+# Music cue
+
+module Gemwarrior
+  module Music
+    def self.cue(sequence)
+      defaults = {
+        :freq_or_note => 440, 
+        :waveform     => 'saw', 
+        :volume       => 0.5, 
+        :duration     => 500,
+        :notext       => true
+      }
+
+      th = Thread.new do
+        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
+      
+      return th.join
+    end
+  end
+end

data/lib/gemwarrior/misc/version.rb

@@ -1,6 +1,6 @@
-# lib/gemwarrior/version.rb
+# lib/gemwarrior/misc/version.rb
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/gemwarrior/misc/wordlist.rb

@@ -1,4 +1,4 @@
-# lib/gemwarrior/wordlist.rb
+# lib/gemwarrior/misc/wordlist.rb
 # List of words for flavor text, hopefully randomized from Wordnik
 
 require 'http'
@@ -112,4 +112,4 @@ module Gemwarrior
     end
 
   end
-end
+end

data/lib/gemwarrior/repl.rb

@@ -53,6 +53,12 @@ module Gemwarrior
       puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
       puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
       puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
+      
+      if world.sound
+        Music::cue([
+          {:freq_or_note => 'A3,E4,C#5,F#5', :duration => 1000}
+        ])
+      end
     end
     
     def print_splash_message

data/lib/gemwarrior/world.rb

@@ -17,7 +17,7 @@ module Gemwarrior
     ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
     ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
   
-    attr_accessor :monsters, :locations, :player, :debug_mode, :use_wordnik
+    attr_accessor :monsters, :locations, :player, :debug_mode, :use_wordnik, :sound
   
     def initialize
       self.monsters   = init_monsters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Michael Chadwick
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
+- !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: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +240,7 @@ files:
 - lib/gemwarrior/game.rb
 - lib/gemwarrior/inventory.rb
 - lib/gemwarrior/misc/animation.rb
+- lib/gemwarrior/misc/music.rb
 - lib/gemwarrior/misc/player_levels.rb
 - lib/gemwarrior/misc/version.rb
 - lib/gemwarrior/misc/wordlist.rb