gemwarrior 0.15.5 → 0.15.10

data/lib/gemwarrior/entities/player.rb

@@ -66,7 +66,7 @@ module Gemwarrior
         weapon_slot = self.inventory.weapon.name
         net_atk_lo = base_atk_lo + self.inventory.weapon.atk_lo
         net_atk_hi = base_atk_hi + self.inventory.weapon.atk_hi
-        net_dexterity = self.dexterity + self.inventory.weapon.dex_mod
+        net_dexterity = base_dexterity + self.inventory.weapon.dex_mod
       end
 
       # juice the armor display
@@ -104,7 +104,7 @@ module Gemwarrior
       self_text << "ABILITIES :"
       self_text << "#{abilities}"
       self_text << "INVENTORY : #{self.inventory.contents}\n"
-      
+
       if GameOptions.data['debug_mode']
         self_text << "\n"
         self_text << "[DEBUG STUFF]\n"
@@ -126,7 +126,7 @@ module Gemwarrior
       self_text << "\n\n"
 
       self_text << "[#{"Current Status".colorize(:yellow)}]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and feeling, generally, #{self.mood.colorize(:yellow)}."
-      
+
       self_text << "\n"
     end
 
@@ -210,41 +210,45 @@ module Gemwarrior
 
     def list_inventory
       inventory.list_contents
-    end 
+    end
 
     def go(world, direction)
       case direction
       when 'north', 'n'
         self.cur_coords = {
-          x: cur_coords[:x], 
+          x: cur_coords[:x],
           y: cur_coords[:y]+1,
           z: cur_coords[:z]
         }
+        direction_cue = :player_travel_north
         direction_text = '^^^'
       when 'east', 'e'
         self.cur_coords = {
-          x: cur_coords[:x]+1, 
+          x: cur_coords[:x]+1,
           y: cur_coords[:y],
           z: cur_coords[:z]
         }
+        direction_cue = :player_travel_east
         direction_text = '>>>'
       when 'south', 's'
         self.cur_coords = {
-          x: cur_coords[:x], 
+          x: cur_coords[:x],
           y: cur_coords[:y]-1,
           z: cur_coords[:z]
         }
+        direction_cue = :player_travel_south
         direction_text = 'vvv'
       when 'west', 'w'
         self.cur_coords = {
-          x: cur_coords[:x]-1, 
+          x: cur_coords[:x]-1,
           y: cur_coords[:y],
           z: cur_coords[:z]
         }
+        direction_cue = :player_travel_west
         direction_text = '<<<'
       end
       world.location_by_coords(self.cur_coords).visited = true
-      print_traveling_text(direction_text)
+      print_traveling_text(direction_cue, direction_text)
 
       # stats
       self.movements_made += 1
@@ -365,8 +369,8 @@ module Gemwarrior
       return 'death'
     end
 
-    def print_traveling_text(direction_text)
-      Audio.play_synth(:player_travel)
+    def print_traveling_text(direction_cue, direction_text)
+      Audio.play_synth(direction_cue)
       Animation.run(phrase: "* #{direction_text} *", oneline: false)
     end
 

data/lib/gemwarrior/entities/weapon.rb

@@ -22,7 +22,7 @@ module Gemwarrior
     end
 
     def use(world)
-      'Save the brrandishing of your weapon for battle.'
+      'Save the brandishing of your weapon for battle.'
     end
 
     def describe_detailed

data/lib/gemwarrior/evaluator.rb

@@ -80,8 +80,8 @@ module Gemwarrior
         'Rest, but ensure battle for testing'
       ]
 
-      self.commands     = %w(character look rest take talk inventory use drop equip unequip go north east south west attack breakthru change version checkupdate help quit quit!)
-      self.aliases      = %w(c l r t tk i u d eq ue g n e s w a br ch v cu h q qq)
+      self.commands     = %w(character look rest take talk inventory use open drop equip unequip go north east south west attack breakthru change version checkupdate help quit quit!)
+      self.aliases      = %w(c l r t tk i u o d eq ue g n e s w a br ch v cu h q qq)
       self.extras       = %w(exit exit! x xx fight f ? ?? ???)
       self.cmd_descriptions = [
         'Display character information',
@@ -91,6 +91,7 @@ module Gemwarrior
         'Talk to person',
         'Look in your inventory',
         'Use item (in inventory or environment)',
+        'Open item (in inventory or environment)',
         'Drop item',
         'Equip item',
         'Unequip item',
@@ -463,7 +464,7 @@ module Gemwarrior
             end
           end
         end
-      when 'use', 'u'
+      when 'use', 'u', 'open', 'o'
         if param1.nil?
           ERROR_USE_PARAM_MISSING
         else

data/lib/gemwarrior/inventory.rb

@@ -26,6 +26,14 @@ module Gemwarrior
       self.armor  = armor
     end
 
+    def an_words
+      ['herb']
+    end
+
+    def article_chooser(word)
+      (VOWELS.include?(word.to_s[0]) or an_words.include?(word.to_s)) ? 'an' : 'a'
+    end
+
     def is_empty?
       self.items.nil? || self.items.empty?
     end
@@ -89,8 +97,7 @@ module Gemwarrior
           if q > 1
             return "You have #{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}."
           else
-            article = VOWELS.include?(i[0]) ? 'an' : 'a'
-            return "You have #{article} #{i.to_s.colorize(:yellow)}."
+            return "You have #{self.article_chooser(i)} #{i.to_s.colorize(:yellow)}."
           end
         # multiple items? return array of strings to mush together
         else
@@ -100,8 +107,7 @@ module Gemwarrior
             if q > 1
               item_arr.push("#{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}")
             else
-              article = VOWELS.include?(i[0]) ? 'an' : 'a'
-              item_arr.push("#{article} #{i.to_s.colorize(:yellow)}")
+              item_arr.push("#{self.article_chooser(i)} #{i.to_s.colorize(:yellow)}")
             end
           end
 
@@ -159,7 +165,7 @@ module Gemwarrior
                 return "The #{i.name.colorize(:yellow)} has taken charge, and been equipped."
               elsif i.is_armor
                 self.armor = i
-                return "The #{i.name.colorize(:yellow)} has fortified, and has been equipped."
+                return "The #{i.name.colorize(:yellow)} has fortified you, and been equipped."
               end
             else
               return ERROR_ITEM_EQUIP_NONARMAMENT

data/lib/gemwarrior/misc/audio.rb

@@ -7,25 +7,43 @@ require_relative '../game_options'
 
 module Gemwarrior
   module Audio
+    # CONSTANTS
+    ERROR_SOUND_NOT_ENABLED = 'Sound is disabled! Enable in main options to hear sound.'
+
     def self.init
       if GameOptions.data['sound_system'].eql?('win32-sound')
         begin
           require 'win32/sound'
-        rescue LoadError => e
+        rescue
           GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Silence for now."
         end
       elsif GameOptions.data['sound_system'].eql?('feep')
         begin
           require 'feep'
-        rescue LoadError => e
+        rescue
           GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}'. Silence for now."
         end
       elsif GameOptions.data['sound_system'].eql?('bloops')
         begin
           require 'bloops'
-        rescue LoadError => e
+        rescue
           GameOptions.data['errors'] = "#{GameOptions.data['sound_system']} could not be loaded. You may need to run 'gem install #{GameOptions.data['sound_system']}aphone'. Silence for now."
         end
+      else
+        GameOptions.data['errors'] = "'#{GameOptions.data['sound_system']}' is not a valid sound system. Audio subsystem load failed."
+      end
+    end
+
+    def self.get_cues
+      if GameOptions.data['sound_enabled']
+        case GameOptions.data['sound_system']
+        when 'win32-sound', 'feep'
+          require_relative 'audio_cues'
+          AudioCues.cues
+        when 'bloops'
+          require_relative 'bloops_cues'
+          BloopsCues.cues
+        end
       end
     end
 
@@ -35,19 +53,23 @@ module Gemwarrior
         when 'win32-sound'
           require_relative 'audio_cues'
           require_relative 'musical_notes'
-          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
-              threads.each { |th| th.join }
             end
           end
         when 'feep'
           require_relative 'audio_cues'
+
           feep_defaults = {
             frequencies:  '440',
             waveform:     'sine',
@@ -56,43 +78,50 @@ module Gemwarrior
             notext:       true
           }
 
-          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
         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?
+          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?
+                  end
                 end
-              end
 
-              threads.each { |th| th.join }
+                threads.each { |th| th.join }
+              end
             end
           end
         end
+      else
+        GameOptions.data['errors'] = ERROR_SOUND_NOT_ENABLED
       end
     end
 

data/lib/gemwarrior/misc/audio_cues.rb

@@ -7,7 +7,7 @@ module Gemwarrior
       @@cues ||= {}
       @@cues[key] = val
     end
-    
+
     def self.cues
       @@cues ||= {}
     end
@@ -33,7 +33,7 @@ module Gemwarrior
       ],
       sample: 'bg1.wav'
     }
-    
+
     self.add :battle_start, {
       synth: [
         { frequencies: 'G4',  duration: 50 },
@@ -93,15 +93,17 @@ module Gemwarrior
 
     self.add :intro, {
       synth: [
-        { frequencies: 'C3,G4',  duration: 50 },
-        { frequencies: 'D3,A4',  duration: 50 },
-        { frequencies: 'E3,B4',  duration: 50 },
-        { frequencies: 'F3,C5',  duration: 50 },
+        { frequencies: 'C4,G4',  duration: 350 },
+        { frequencies: 'D3,A4',  duration: 85 },
+        { frequencies: 'E3,B4',  duration: 85 },
+        { frequencies: 'F3,C5',  duration: 170 },
+        { frequencies: 'F3,C5',  duration: 170 },
+        { frequencies: 'F3,C5',  duration: 170 },
         { frequencies: 'G3,B4,D5',  duration: 350 }
       ],
       sample: 'intro.wav'
     }
-    
+
     self.add :player_level_up, {
       synth: [
         { frequencies: 'D4,A4,D5,A5,D6', duration: 100 },
@@ -129,6 +131,68 @@ module Gemwarrior
       sample: 'player_travel.wav'
     }
 
+    self.add :player_travel_east, {
+      synth: [
+        { frequencies: 'E4', duration: 75 },
+        { frequencies: 'G4', duration: 75 },
+        { frequencies: 'E4', duration: 75 }
+      ],
+      sample: 'player_travel_east.wav'
+    }
+
+    self.add :player_travel_north, {
+      synth: [
+        { frequencies: 'C4', duration: 75 },
+        { frequencies: 'D4', duration: 75 },
+        { frequencies: 'E4', duration: 75 }
+      ],
+      sample: 'player_travel_north.wav'
+    }
+
+    self.add :player_travel_south, {
+      synth: [
+        { frequencies: 'E4', duration: 75 },
+        { frequencies: 'D4', duration: 75 },
+        { frequencies: 'C4', duration: 75 }
+      ],
+      sample: 'player_travel_south.wav'
+    }
+
+    self.add :player_travel_west, {
+      synth: [
+        { frequencies: 'C4', duration: 75 },
+        { frequencies: 'A3', duration: 75 },
+        { frequencies: 'C4', duration: 75 }
+      ],
+      sample: 'player_travel_west.wav'
+    }
+
+    self.add :resume_game, {
+      synth: [
+        { frequencies: 'C4', duration: 75 },
+        { frequencies: 'D4', duration: 75 },
+        { frequencies: 'E4', duration: 75 },
+        { frequencies: 'F#4', duration: 75 },
+        { frequencies: 'G#4', duration: 75 },
+        { frequencies: 'A#4', duration: 75 },
+        { frequencies: 'C5', duration: 75 },
+        { frequencies: 'D5', duration: 75 },
+        { frequencies: 'E5', duration: 75 },
+        { frequencies: 'F#5', duration: 75 }
+      ],
+      sample: 'test.wav'
+    }
+
+    self.add :test, {
+      synth: [
+        { frequencies: 'F4', duration: 75 },
+        { frequencies: 'E5', duration: 75 },
+        { frequencies: 'C5', duration: 75 },
+        { frequencies: 'E5', duration: 75 }
+      ],
+      sample: 'test.wav'
+    }
+
     self.add :uncover_secret, {
       synth: [
         { frequencies: 'F5', duration: 150 },

data/lib/gemwarrior/misc/bloops_cues.rb

@@ -7,7 +7,7 @@ module Gemwarrior
       @@cues ||= {}
       @@cues[key] = val
     end
-    
+
     def self.cues
       @@cues ||= {}
     end
@@ -33,7 +33,7 @@ module Gemwarrior
       ],
       sample: 'bg1.wav'
     }
-    
+
     self.add :battle_start, {
       synth: [
         { s1: '16:G4' },
@@ -93,15 +93,17 @@ module Gemwarrior
 
     self.add :intro, {
       synth: [
-        { s1: '16:C3', s2: '16:G4' },
+        { s1: '4:C4', s2: '4:G4' },
         { s1: '16:D3', s2: '16:A4' },
         { s1: '16:E3', s2: '16:B4' },
-        { s1: '16:F3', s2: '16:C5' },
+        { s1: '8:F3', s2: '8:C5' },
+        { s1: '8:F3', s2: '8:C5' },
+        { s1: '8:F3', s2: '8: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' },
@@ -129,6 +131,62 @@ module Gemwarrior
       sample: 'player_travel.wav'
     }
 
+    self.add :player_travel_east, {
+      synth: [
+        { s1: '16:E4' },
+        { s1: '16:G4' },
+        { s1: '16:E4' }
+      ],
+      sample: 'player_travel_east.wav'
+    }
+
+    self.add :player_travel_north, {
+      synth: [
+        { s1: '16:C4' },
+        { s1: '16:D4' },
+        { s1: '16:E4' }
+      ],
+      sample: 'player_travel_north.wav'
+    }
+
+    self.add :player_travel_south, {
+      synth: [
+        { s1: '16:E4' },
+        { s1: '16:D4' },
+        { s1: '16:C4' }
+      ],
+      sample: 'player_travel_south.wav'
+    }
+
+    self.add :player_travel_west, {
+      synth: [
+        { s1: '16:C4' },
+        { s1: '16:A4' },
+        { s1: '16:C4' }
+      ],
+      sample: 'player_travel_west.wav'
+    }
+
+    self.add :resume_game, {
+      synth: [
+        { s1: '16:C4' },
+        { s1: '16:D4' },
+        { s1: '16:E4' },
+        { s1: '8:F#4' }
+      ],
+      sample: 'test.wav'
+    }
+
+    self.add :test, {
+      synth: [
+        { s1: '4:F4' },
+        { s1: '4:E5' },
+        { s1: '4:C5' },
+        { s1: '4:E5' }
+      ],
+      sample: 'test.wav'
+    }
+
     self.add :uncover_secret, {
       synth: [
         { s1: '8:F5' },