gemwarrior 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9cf8c36b62d8e2662f76e081ae2cc645aa216e5d11b9507dc38816cf6f9ffa3
-  data.tar.gz: 57ab765744b3882e2e314d0e879b80e1c886541401097f690b6bb8789d28ba9b
+  metadata.gz: 1b28ed81896ffa1b5bbd65ea94b65896ab620d2454cfccb2b3f23b34ea722225
+  data.tar.gz: b11bda6cf62868a0f3ef0667f2233d4a9dd2c799aadef8891adeaf145d712618
 SHA512:
-  metadata.gz: 870efff210d8a1a8abb9146944559df7441edb3dd7cfd655645409a4b11ec26464e2ddb59fee8c75941e769cd9f7c8a081470eaa24687d4713d4c789abc8e58b
-  data.tar.gz: 93d8eac5c7a2861857485fc31b7264c8c0525017d8b89e363b304a9434c05a9b751ad9b52293702f1d2fb8a40f9e6ecfb10a1456030d4a8e410a77f1d8da09ed
+  metadata.gz: 2e87371072ecfe0505a116e7200ade73b73c9bbe45a8aa18c4b6231401940cc2bacda4422b9c9044f43746a1a68772d27108be73ec8c3d238a7070b6e169f75b
+  data.tar.gz: 4bee0ae7c80d7466d124d0d36761a933197ea2e18abb3b21d1e12a484a1fc58d23372dba036e4ef690a0971a41344a3be668ed1a1a36c701129df5e983a858fc

data/lib/gemwarrior/entities/people/arena_master.rb

@@ -1,49 +1,49 @@
-# lib/gemwarrior/entities/people/arena_master.rb
-# Entity::Creature::Person::ArenaMaster
-
-require_relative '../person'
-
-module Gemwarrior
-  class ArenaMaster < Person
-    # CONSTANTS
-    ARENA_FEE         = 50
-    ARENA_MASTER_NAME = 'Iolita'
-
-    def initialize
-      super
-
-      self.name         = 'arena_master'
-      self.name_display = 'Arena Master'
-      self.description  = 'She wears simple clothing, but carries herself with an air of authority. You think she may be the person to talk with if you want to engage in battle.'
-    end
-
-    def use(world)
-      puts "You approach #{ARENA_MASTER_NAME.colorize(color: :white, background: :black)}, the Arena Master, and ask to prove your mettle in the arena. She snickers to herself, but sees you have a good spirit about you."
-      puts
-
-      if world.player.rox >= ARENA_FEE
-        print "She asks for the requisite payment: #{ARENA_FEE} rox. Do you pay up? (y/n) "
-        answer = gets.chomp.downcase
-        
-        case answer
-        when 'y', 'yes'
-          world.player.rox -= ARENA_FEE
-          puts
-          puts 'She pockets the money and motions toward the center of the arena. She reminds you that you will be facing an ever-worsening onslaught of monsters. Each one you dispatch nets you a bonus cache of rox in addition to whatever the monster gives you. You will also become more experienced the longer you last. Finally, you can give up at any time between battles.'
-          puts
-          puts 'She finishes by wishing you good luck!'
-
-          return { type: 'arena', data: nil }
-        else
-          puts
-          puts 'She gives you a dirty look, as you have obviously wasted her time. You are told not to mess around with her anymore, and she turns away from you.'
-          return { type: nil, data: nil }
-        end
-      else
-        puts 'She can tell you seem particularly poor today and says to come back when that has changed.'
-        puts
-        return { type: nil, data: nil }
-      end
-    end
-  end
-end
+# lib/gemwarrior/entities/people/arena_master.rb
+# Entity::Creature::Person::ArenaMaster
+
+require_relative '../person'
+
+module Gemwarrior
+  class ArenaMaster < Person
+    # CONSTANTS
+    ARENA_FEE         = 50
+    ARENA_MASTER_NAME = 'Iolita'
+
+    def initialize
+      super
+
+      self.name         = 'arena_master'
+      self.name_display = 'Arena Master'
+      self.description  = 'She wears simple clothing, but carries herself with an air of authority. You think she may be the person to talk with if you want to engage in battle.'
+    end
+
+    def use(world)
+      puts "You approach #{ARENA_MASTER_NAME.colorize(color: :white, background: :black)}, the Arena Master, and ask to prove your mettle in the arena. She snickers to herself, but sees you have a good spirit about you."
+      puts
+
+      if world.player.rox >= ARENA_FEE
+        print "She asks for the requisite payment: #{ARENA_FEE} rox. Do you pay up? (y/n) "
+        answer = gets.chomp.downcase
+        
+        case answer
+        when 'y', 'yes'
+          world.player.rox -= ARENA_FEE
+          puts
+          puts 'She pockets the money and motions toward the center of the arena. She reminds you that you will be facing an ever-worsening onslaught of monsters. Each one you dispatch nets you a bonus cache of rox in addition to whatever the monster gives you. You will also become more experienced the longer you last. Finally, you can give up at any time between battles.'
+          puts
+          puts 'She finishes by wishing you good luck!'
+
+          return { type: 'arena', data: nil }
+        else
+          puts
+          puts 'She gives you a dirty look, as you have obviously wasted her time. You are told not to mess around with her anymore, and she turns away from you.'
+          return { type: nil, data: nil }
+        end
+      else
+        puts 'She can tell you seem particularly poor today and says to come back when that has changed.'
+        puts
+        return { type: nil, data: nil }
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/people/rockney.rb

@@ -8,8 +8,8 @@ require_relative '../weapons/dagger'
 module Gemwarrior
   class Rockney < Person
     # CONSTANTS
-    PRICE_HERB              = 10
-    PRICE_DAGGER            = 150
+    PRICE_HERB              = 5
+    PRICE_DAGGER            = 10
     PLAYER_ROX_INSUFFICIENT = 'Pity. You are a bit short on funds to purchase that item.'
     PLAYER_ITEMS_ADDITIONAL = 'Anything else?'
     PLAYER_COMMAND_INVALID  = 'Huh?'

data/lib/gemwarrior/entities/people/ware_hawker.rb

@@ -9,9 +9,9 @@ require_relative '../armor/iron_helmet'
 module Gemwarrior
   class WareHawker < Person
     # CONSTANTS
-    PRICE_IRON_HELMET       = 100
-    PRICE_MACE              = 200
-    PRICE_SPEAR             = 250
+    PRICE_IRON_HELMET       = 10
+    PRICE_MACE              = 30
+    PRICE_SPEAR             = 40
     PLAYER_ROX_INSUFFICIENT = 'You have insufficient rox to purchase that. Quit testing me, human.'
     PLAYER_ITEMS_ADDITIONAL = 'Will there be something else?'
     PLAYER_COMMAND_INVALID  = 'That means nothing to me.'

data/lib/gemwarrior/entities/person.rb

@@ -7,12 +7,13 @@ module Gemwarrior
   class Person < Creature
     def initialize
       super
-      
+
       self.name         = 'person.'
       self.name_display = Formatting::upstyle(name)
       self.description  = 'It appears to be a person of some kind.'
+      self.takeable     = false
     end
-  
+
     def use(world)
       'That person does not seem to want to talk to you right now.'
     end

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[0]) or an_words.include?(word)) ? '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_cues.rb

@@ -167,6 +167,22 @@ module Gemwarrior
       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 },

data/lib/gemwarrior/misc/bloops_cues.rb

@@ -167,6 +167,16 @@ module Gemwarrior
       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' },

data/lib/gemwarrior/repl.rb

@@ -413,6 +413,7 @@ module Gemwarrior
             run_main_menu
           else
             print_errors
+            play_resume_tune
             load_saved_world(result)
             return
           end
@@ -647,6 +648,10 @@ module Gemwarrior
       Audio.play_synth(:intro)
     end
 
+    def play_resume_tune
+      Audio.play_synth(:resume_game)
+    end
+
     def play_test_tune
       Audio.play_synth(:test)
     end

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os