gemwarrior 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a63dbf4d7fa1730e5bb7504020b668e54cb0a95
-  data.tar.gz: 4ed06ecc25c511622ef4730e7bbc5d9b2c2d1dcb
+  metadata.gz: c311f05d4c6938a47b6d445678c5d097c569b3c3
+  data.tar.gz: 46052a56af92e3ad73e0e964756d75dcafad5ad8
 SHA512:
-  metadata.gz: fa9c14bded730f4ae0f9693094e8893bb7f5f133be99422e90baabe10da96c92f04461d47a4f94e21e2af4557b08261db405c5f064c6c89f5ecd9654b42d53fe
-  data.tar.gz: d75e3ab4f36c04a6946ee6104858f91a7f6d303e92380f193d39741230fe26d02e0a226a9dfd25735db19b85b4fbadd723d0e025f0aab206197471cd1cc86977
+  metadata.gz: 5dffa3a34da0a0ad1b871169b8d89b9a35070db0d70625f1221eaa0b3ef31334e9609a6e500b1a8590342c0d10250b20314f3c324200383a7322af8840435c90
+  data.tar.gz: 9723c86b4a47b72c76a2517451ffee3ba2fd88effc09e452547eb06546976009d390d1e21903c53d79f6b0da8826d58c5aec53b0cf62b4afe547433ec38e1b36

data/bin/gemwarrior

@@ -27,7 +27,7 @@ def parse_options_cli
     new_skip:       false,
     resume_skip:    false,
     sound_enabled:  false,
-    sound_system:   nil,
+    sound_system:   'feep',
     sound_volume:   0.3,
     use_wordnik:    false, 
     extra_command:  nil

data/data/default_world.yaml

@@ -1777,7 +1777,7 @@ locations:
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
   name: Spinelia (Southeast)
-  description: The southeast of Spinelia contains a bunch of people, just kind of
+  description: The southeast of Spinelia contains a few people, just kind of
     hanging out.
   coords:
     :x: 8
@@ -1790,7 +1790,38 @@ locations:
     :west: true
   danger_level: :none
   monster_level_range: 
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::ThinMan
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: thin_man
+    description: An almost shockingly gaunt man is sitting on the ground, resting against a wall. He   
+      wears a patchwork quilt of a hat, and his slender frame is covered by a simple brown tunic. His feet 
+      point comically toward the sky in brown boots while his head dips down slightly, eyes watching 
+      something in the distance you can't see.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
+  - !ruby/object:Gemwarrior::DrunkMan
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: drunk_man
+    description: Some supernatural force is surely keeping this obviously smashed individual from 
+      toppling over to the ground. The inebriated fellow somehow continues to stumble about in a small 
+      circle near a smattering of shipping crates, looking simultaneously dazed and cheerful.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false
@@ -1809,13 +1840,52 @@ locations:
     :west: true
   danger_level: :none
   monster_level_range: 
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::Pig
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: pig
+    description: Dirty, eating slop, but still kind of cute. Yep, this is a pig.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
+  - !ruby/object:Gemwarrior::Cow
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: cow
+    description: Grazing on some fake grass, unperturbed, this black and white herd animal looks bored.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
+  - !ruby/object:Gemwarrior::Goat
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: goat
+    description: The scruff is strong with this one as it chews through what appears to be a recent mystery novel most likely thrown into the pen by a passerby.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
   name: Spinelia (Northwest)
-  description: Residences line the northwest corner of Spinela, each one similar to
+  description: Residences line the northwest corner of Spinelia, each one similar to
     each other, made of granite and stone, featuring a single window and a single
     door. One particular house's hallmark appears to be a rather fanciful woman leaning
     on its facade, looking shifty.
@@ -1830,7 +1900,22 @@ locations:
     :west: false
   danger_level: :none
   monster_level_range: 
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::ShiftyWoman
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    talkable: true
+    name: shifty_woman
+    description: Sharply dressed with impeccable style, you still can't shake the feeling that this 
+      otherwise ordinary woman is up to something. It might be the way she almost impulsively looks 
+      back and forth along the town street while rubbing her hands together menacingly.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false

data/lib/gemwarrior/entities/item.rb

@@ -26,6 +26,7 @@ module Gemwarrior
       status_text << "ATTACK: #{atk_lo}-#{atk_hi} \n".colorize(:white) unless atk_lo.nil?
       status_text << "TAKEABLE? #{takeable}\n".colorize(:white)
       status_text << "USEABLE? #{useable}\n".colorize(:white)
+      status_text << "USED? #{used}\n".colorize(:white)
       status_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
       status_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
       status_text << "NUMBER OF USES? #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?

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

@@ -0,0 +1,26 @@
+# lib/gemwarrior/entities/items/cow.rb
+# Item::Cow
+
+require_relative '../item'
+
+module Gemwarrior
+  class Cow < Item
+    def initialize
+      super
+
+      self.name         = 'cow'
+      self.description  = 'Grazing on some fake grass, unperturbed, this black and white herd animal looks bored.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      puts '>> "Moo."'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+# lib/gemwarrior/entities/items/drunk_man.rb
+# Item::DrunkMan
+
+require_relative '../item'
+require_relative '../../misc/formatting'
+
+module Gemwarrior
+  class DrunkMan < Item
+    include Formatting
+
+    def initialize
+      super
+
+      self.name         = 'drunk_man'
+      self.description  = 'Some supernatural force is surely keeping this obviously smashed individual from toppling over to the ground. The inebriated fellow somehow continues to stumble about in a small circle near a smattering of shipping crates, looking simultaneously dazed and cheerful.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      choose_blurting
+
+      self.used = [true, false].sample
+
+      { type: nil, data: nil }
+    end
+
+    def choose_blurting
+      choice = [1, 2, 3, 4].sample
+
+      case choice
+      when 1
+        print '>> "'
+        print to_hooch('I still can\'t believe I lost at the Arena! I was doing so well, and then a slippery citrinaga got a cheap shot on me.')
+        print '"'
+        print "\n"
+        print '>> "'
+        print to_hooch('Ehhh. Someday I\'ll be back and I\'ll be victorious. That smarmy Arena Master ain\'t gettin\' the last word!')
+        print '"'
+        print "\n"
+      when 2
+        print '>> "'
+        print to_hooch('Maybe I just needed a better weapon that last fight in the arena. Yeah! That must be it.')
+        print '"'
+        print "\n"
+      when 3
+        print '>> "'
+        print to_hooch('Man, my head really hurts. I\'m not sure if it\'s because of the fighting or the booze.')
+        print '"'
+        print "\n"
+        print '>> "'
+        print to_hooch('I should probably get something else to drink.')
+        print '"'
+        print "\n\n"
+        puts 'The man looks like he has thought of something genius for a moment, but then scratches his head while stumbling around in his well-worn circle again.'
+      when 4
+        print '>> "'
+        print to_hooch('Ahhhhhhhhhhhhhhhhhhhh!')
+        print '"'
+        print "\n\n"
+        puts  'He begins to quickly become frantic as he notices you approaching, and then falls over, crumpled to the floor.'
+        puts
+        puts  'You approach to check if he\'s still breathing. As you get closer, he gets back up, hardly noticing you, and begins his spiral once again.'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# lib/gemwarrior/entities/items/goat.rb
+# Item::Goat
+
+require_relative '../item'
+
+module Gemwarrior
+  class Goat < Item
+    def initialize
+      super
+
+      self.name         = 'goat'
+      self.description  = 'The scruff is strong with this one as it chews through what appears to be a recent mystery novel most likely thrown into the pen by a passerby.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      puts '>> "Baa."'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# lib/gemwarrior/entities/items/pig.rb
+# Item::Pig
+
+require_relative '../item'
+
+module Gemwarrior
+  class Pig < Item
+    def initialize
+      super
+
+      self.name         = 'pig'
+      self.description  = 'Dirty, eating slop, but still kind of cute. Yep, this is a pig.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      puts '>> "Oink."'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# lib/gemwarrior/entities/items/shifty_woman.rb
+# Item::ShiftyWoman
+
+require_relative '../item'
+
+module Gemwarrior
+  class ShiftyWoman < Item
+    def initialize
+      super
+
+      self.name         = 'shifty_woman'
+      self.description  = 'Sharply dressed with impeccable style, you still can\'t shake the feeling that this otherwise ordinary woman is up to something. It might be the way she almost impulsively looks back and forth along the town street while rubbing her hands together menacingly.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      if self.used
+        puts 'Attempting a friendly overture again, the woman turns and looks directly at you. Her brown eyes glint in the sun, almost turning an ochre hue. Her look burns you to the core, causing you to physically recoil a little.'
+        puts
+        puts 'You step back a few paces and quickly look elsewhere.'
+      else
+        puts 'The woman averts her eyes from you as you commence with a greeting, giving a little scowl while she is at it.'
+        
+        self.used = true
+      end
+      
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# lib/gemwarrior/entities/items/thin_man.rb
+# Item::ThinMan
+
+require_relative '../item'
+
+module Gemwarrior
+  class ThinMan < Item
+    def initialize
+      super
+
+      self.name         = 'thin_man'
+      self.description  = 'An almost shockingly gaunt man is sitting on the ground, resting against a wall. He wears a patchwork quilt of a hat, and his slender frame is covered by a simple brown tunic. His feet point comically toward the sky in brown boots while his head dips down slightly, eyes watching something in the distance you can\'t see.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      if self.used
+        puts 'The thin man barely moves his head as he puts up a single grim hand, motioning you to back off.'
+      else
+        puts 'The thin man lifts his head up slightly, meets your gaze, and responds to your greeting:'
+        puts '>> "I may be incredibly spare right now, but I was once a strapping young person, such as yourself. Just in case you ever fall during your journey, be sure to approach unlikely sources, as you may find those who will help you."'
+        puts '>> "Now, please, allow me my peace."'
+
+        self.used = true
+      end
+      
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -2,8 +2,8 @@
 # Item::WareHawker
 
 require_relative '../item'
-require_relative 'herb'
-require_relative 'dagger'
+require_relative 'mace'
+require_relative 'spear'
 
 module Gemwarrior
   class WareHawker < Item

data/lib/gemwarrior/misc/formatting.rb

@@ -6,25 +6,41 @@ module Gemwarrior
     def self.upstyle(str_arr)
       if str_arr.is_a? Array
         str_arr_upstyled = []
-        
+
         str_arr.each do |str_arr_item|
           str_arr_item_upstyled = []
           
           str_arr_item.split(' ').each do |s|
             str_arr_item_upstyled << upstyle_string(s)
           end
-          
+
           str_arr_upstyled << str_arr_item_upstyled.join(' ')
         end
-        
+
         return str_arr_upstyled
       else
         return upstyle_string(str_arr)
       end
     end
-    
+
+    def to_hooch(s)
+      words = s.split(' ')
+      words_hooched = []
+
+      words.each do |w|
+        if rand(0..100) > 60 and w.length > 1
+          w = w.split('')
+          w = w.insert(rand(0..w.length-1), '*HIC*')
+          w = w.join('')
+        end
+        words_hooched << w
+      end
+      
+      return words_hooched.join(' ')
+    end
+
     private
-    
+
     def self.upstyle_string(s)
       s_upstyle = ''
       s_upstyle << s[0].upcase

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -283,12 +283,15 @@ files:
 - lib/gemwarrior/entities/items/arena_master.rb
 - lib/gemwarrior/entities/items/bed.rb
 - lib/gemwarrior/entities/items/couch.rb
+- lib/gemwarrior/entities/items/cow.rb
 - lib/gemwarrior/entities/items/cup.rb
 - lib/gemwarrior/entities/items/dagger.rb
 - lib/gemwarrior/entities/items/dehumidifier.rb
+- lib/gemwarrior/entities/items/drunk_man.rb
 - lib/gemwarrior/entities/items/feather.rb
 - lib/gemwarrior/entities/items/floor_tile.rb
 - lib/gemwarrior/entities/items/flower.rb
+- lib/gemwarrior/entities/items/goat.rb
 - lib/gemwarrior/entities/items/gun.rb
 - lib/gemwarrior/entities/items/herb.rb
 - lib/gemwarrior/entities/items/keystone.rb
@@ -299,8 +302,10 @@ files:
 - lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/opalaser.rb
 - lib/gemwarrior/entities/items/pedestal.rb
+- lib/gemwarrior/entities/items/pig.rb
 - lib/gemwarrior/entities/items/pond.rb
 - lib/gemwarrior/entities/items/rope.rb
+- lib/gemwarrior/entities/items/shifty_woman.rb
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparklything.rb
@@ -309,6 +314,7 @@ files:
 - lib/gemwarrior/entities/items/stone.rb
 - lib/gemwarrior/entities/items/stonemite.rb
 - lib/gemwarrior/entities/items/tent.rb
+- lib/gemwarrior/entities/items/thin_man.rb
 - lib/gemwarrior/entities/items/throne.rb
 - lib/gemwarrior/entities/items/tree.rb
 - lib/gemwarrior/entities/items/ware_hawker.rb
@@ -369,4 +375,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/gemwarrior_spec.rb
+- spec/spec_helper.rb