gemwarrior 0.9.33 → 0.9.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ca88b5006faf19bff1e6d1ffb9f05d8b882de6
-  data.tar.gz: 46ed917818ee4cdff4a53b7c672a2ce02269ed9f
+  metadata.gz: 523d98df545f5eaf8a9279b406d78dbfef8f24e3
+  data.tar.gz: bebad9e25fd49e38414971b4a00eae814ad47f30
 SHA512:
-  metadata.gz: 260bda072394723244614a23f014daebbe428ffc40a7fcd0ee55a88f2bb5444c7cda3571c9c5858d9b2a445228c0958d3bdcb9c50dcf23f7ecc449d9a7f32192
-  data.tar.gz: e6530a704db9743f72e056d481db1681c63be07f6a3d90425959bd9ab10296ffa570c72d47da3fc30a294eeeed13d7b737c4da767c3181a3179b5bf5a4a18323
+  metadata.gz: 0af08ecba64189fd0d0584e2083784aecca10fc9a19e988d986e4d7415f2867f3b129c9631db7377496b4d7819e5647e43ed49c4f3f59991c6877844e2f86d57
+  data.tar.gz: dc352fd0e448a78e6441a78601694a744afae6f3a3b62e18e2a9249bffe95d19bbff2d5ad40e762ca8593a40e956f59dc65f63b6684a3e57affed7bab024182e

data/data/locations.yml

@@ -925,6 +925,8 @@
     east:  true
     south: true
     west:  false
+  items:
+  - WareHawker
 
 -
   name:                 'Spinelia (Southeast)'

data/lib/gemwarrior/battle.rb

@@ -181,7 +181,15 @@ module Gemwarrior
       else
         if entity.eql?(monster)
           # base attack range
-          atk_range = player.atk_lo..player.atk_hi
+          base_atk_lo = player.atk_lo
+          base_atk_hi = player.atk_hi
+          
+          if player.has_weapon_equipped?
+            base_atk_lo += player.inventory.weapon.atk_lo
+            base_atk_hi += player.inventory.weapon.atk_hi
+          end
+          
+          atk_range = base_atk_lo..base_atk_hi
 
           # beast mode modifier
           if player.beast_mode

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

@@ -8,8 +8,8 @@ module Gemwarrior
     def initialize
       self.name         = 'dagger'
       self.description  = 'Flint that has been sharpened to a point, attached to a block of smooth granite by thin rope. Truly a work of art.'
-      self.atk_lo       = 2
-      self.atk_hi       = 4
+      self.atk_lo       = 1
+      self.atk_hi       = 3
       self.takeable     = true
       self.useable      = false
       self.equippable   = true

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

@@ -8,8 +8,8 @@ module Gemwarrior
     def initialize
       self.name         = 'gun'
       self.description  = 'Pew pew goes this firearm, you suspect.'
-      self.atk_lo       = 3
-      self.atk_hi       = 5
+      self.atk_lo       = 2
+      self.atk_hi       = 4
       self.takeable     = true
       self.useable      = true
       self.equippable   = true
@@ -17,7 +17,7 @@ module Gemwarrior
     end
 
     def use(player = nil)
-      puts 'You pull the trigger on the gun, but realize there are no bullets in it. So, it does not do much except cause a barely audible *click* sound.'
+      puts 'You pull the trigger on the gun, but it does not fire. An inscription on the barrel reads: "Only shoots when pointed at a monster." How safe!'
       { type: nil, data: nil }
     end
   end

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/mace.rb
+# Item::Mace
+
+require_relative '../item'
+
+module Gemwarrior
+  class Mace < Item
+    def initialize
+      self.name         = 'mace'
+      self.description  = 'Sharp spikes atop a steel ball, affixed to a sturdy wooden handle. You could do damage with this.'
+      self.atk_lo       = 4
+      self.atk_hi       = 6
+      self.takeable     = true
+      self.useable      = true
+      self.consumable   = false
+      self.equippable   = true
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You swing the mace around a few times, really testing out its smashability.'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -8,8 +8,8 @@ module Gemwarrior
     def initialize
       self.name         = 'opalaser'
       self.description  = 'Gleaming with supernatural light, this object feels alien, yet familiar.'
-      self.atk_lo       = 10
-      self.atk_hi       = 12
+      self.atk_lo       = 9
+      self.atk_hi       = 11
       self.takeable     = true
       self.useable      = true
       self.equippable   = true

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

@@ -8,6 +8,8 @@ require_relative 'dagger'
 module Gemwarrior
   class SmallHole < Item
     # CONSTANTS
+    PRICE_HERB              = 10
+    PRICE_DAGGER            = 150
     PLAYER_ROX_INSUFFICIENT = '>> "Pity. You are a bit short on funds to purchase that item."'
     PLAYER_ITEMS_ADDITIONAL = '>> "Anything else?"'
     PLAYER_COMMAND_INVALID  = '>> "Huh?"'
@@ -25,25 +27,26 @@ module Gemwarrior
     
     def use(player = nil)
       puts 'You lower yourself to the ground and attempt to peer in the hole in the wall. Just as you begin to think this is a fruitless endeavor, a pair of bright, beady eyes manifest, and an unexpectedly low voice begins speaking to you:'
-      
+      puts
+
       rat_shop(player)
     end
-    
+
     def reuse(player = nil)
       rat_shop(player)
     end
-      
+
     def rat_shop(player)
       items_purchased = []
-    
+
       puts '>> "Hello, wanderer. Welcome to my establishment, as it were. Are you in need of anything?"'
       puts
       puts 'The creature gently shoves a small slip of paper out of his hole and towards you. You take a peek and notice it has a list of things with prices on it.'
       puts
       puts 'Rockney\'s Hole in the Wall'
       puts '--------------------------'
-      puts '(1) Herb     - 10  rox'
-      puts '(2) Dagger   - 150 rox'
+      puts "(1) Herb     - #{PRICE_HERB}  rox"
+      puts "(2) Dagger   - #{PRICE_DAGGER} rox"
       puts
       puts '>> "What are you in need of?"'
 
@@ -51,9 +54,10 @@ module Gemwarrior
         puts ' 1 - Herb'
         puts ' 2 - Dagger'
         puts ' x - leave'
-      
+        print 'Option? '
+
         choice = gets.chomp!
-      
+
         case choice
         when '1'
           if player.rox >= 10

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

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/spear.rb
+# Item::Spear
+
+require_relative '../item'
+
+module Gemwarrior
+  class Spear < Item
+    def initialize
+      self.name         = 'spear'
+      self.description  = 'Sharp spikes atop a steel ball, affixed to a sturdy wooden handle. You could do damage with this.'
+      self.atk_lo       = 3
+      self.atk_hi       = 7
+      self.takeable     = true
+      self.useable      = true
+      self.consumable   = false
+      self.equippable   = true
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'This spear does, indeed, appear to strike fear upon that which is near.'
+      { type: nil, data: nil }
+    end
+  end
+end

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

@@ -8,8 +8,8 @@ module Gemwarrior
     def initialize
       self.name         = 'stone'
       self.description  = 'A small, sharp mega pebble, suitable for tossing in amusement, and perhaps combat.'
-      self.atk_lo       = 2
-      self.atk_hi       = 3
+      self.atk_lo       = 1
+      self.atk_hi       = 2
       self.takeable     = true
       self.useable      = false
       self.equippable   = true

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

@@ -0,0 +1,91 @@
+# lib/gemwarrior/entities/items/ware_hawker.rb
+# Item::WareHawker
+
+require_relative '../item'
+require_relative 'herb'
+require_relative 'dagger'
+
+module Gemwarrior
+  class WareHawker < Item
+    # CONSTANTS
+    PRICE_MACE              = 200
+    PRICE_SPEAR             = 250
+    PLAYER_ROX_INSUFFICIENT = '>> "Are you seriously wasting my time? You are testing me, human."'
+    PLAYER_ITEMS_ADDITIONAL = '>> "Will there be something else?"'
+    PLAYER_COMMAND_INVALID  = '>> "That means nothing to me."'
+
+    def initialize
+      self.name         = 'ware_hawker'
+      self.description  = 'A literal anthropomorphic hawk has set up shop behind a crudely-made table. Some wares are scattered atop its surface, seemingly within anyone\'s grasp, but the hawk\'s piercing eyes seem to belie this observation.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+
+    def use(player = nil)
+      puts 'You greet the hawk, mentioning that you are interested in the objects presented. The hawk speaks in a beautiful, yet commanding, tone:'
+      puts
+
+      hawk_shop(player)
+    end
+
+    def reuse(player = nil)
+      hawk_shop(player)
+    end
+
+    def hawk_shop(player)
+      items_purchased = []
+    
+      puts '>> "I hope you have rox, human. My time is amenable to business transactions, not idle chit chat. What do you want?"'
+      puts
+      puts 'A feathered arm quickly moves across the table in an arc suggesting to you that a choice is to be made. Each object has a price tag underneath it, painstakingly written in ink.'
+      puts
+      puts "(1) Mace     - #{PRICE_MACE} rox"
+      puts "(2) Spear    - #{PRICE_SPEAR} rox"
+      puts
+      puts '>> "Choose. Now.'
+
+      loop do
+        puts ' 1 - Mace'
+        puts ' 2 - Spear'
+        puts ' x - leave'
+        print 'Option? '
+        choice = gets.chomp!
+
+        case choice
+        when '1'
+          if player.rox >= PRICE_MACE
+            player.rox -= PRICE_MACE
+            items_purchased.push(Mace.new)
+            puts '>> "Yes, fine."'
+            puts PLAYER_ITEMS_ADDITIONAL
+            next
+          else
+            puts PLAYER_ROX_INSUFFICIENT
+            next
+          end
+        when '2'
+          if player.rox >= PRICE_SPEAR
+            player.rox -= PRICE_SPEAR
+            items_purchased.push(Spear.new)
+            puts '>> "Hmph. Very well, then."'
+            puts PLAYER_ITEMS_ADDITIONAL
+            next
+          else
+            puts PLAYER_ROX_INSUFFICIENT
+            next
+          end
+        when 'x'
+          puts '>> "Our business is complete then."'
+          return { type: 'purchase', data: items_purchased }
+        else
+          puts PLAYER_COMMAND_INVALID
+          next
+        end
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/player.rb

@@ -66,10 +66,12 @@ module Gemwarrior
       end
 
       weapon_slot = ''
+      atk_lo = self.atk_lo
+      atk_hi = self.atk_hi
       if has_weapon_equipped?
         weapon_slot = inventory.weapon.name
-        self.atk_lo = inventory.weapon.atk_lo
-        self.atk_hi = inventory.weapon.atk_hi
+        atk_lo += inventory.weapon.atk_lo
+        atk_hi += inventory.weapon.atk_hi
       else
         weapon_slot = '(unarmed)'
       end
@@ -86,7 +88,7 @@ module Gemwarrior
       self_text << "LEVEL     : #{self.level}\n"
       self_text << "EXPERIENCE: #{self.xp}\n"
       self_text << "HIT POINTS: #{self.hp_cur}/#{self.hp_max}\n"
-      self_text << "ATTACK    : #{self.atk_lo}-#{self.atk_hi}\n"
+      self_text << "ATTACK    : #{atk_lo}-#{atk_hi}\n"
       self_text << "DEXTERITY : #{self.dexterity}\n"
       self_text << "DEFENSE   : #{self.defense}\n"
       self_text << "ABILITIES : #{abilities}\n"

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.33
+  version: 0.9.34
 platform: ruby
 authors:
 - Michael Chadwick
@@ -252,6 +252,7 @@ files:
 - lib/gemwarrior/entities/items/keystone.rb
 - lib/gemwarrior/entities/items/ladder.rb
 - lib/gemwarrior/entities/items/letter.rb
+- lib/gemwarrior/entities/items/mace.rb
 - lib/gemwarrior/entities/items/map.rb
 - lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/opalaser.rb
@@ -261,12 +262,14 @@ files:
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparklything.rb
+- lib/gemwarrior/entities/items/spear.rb
 - lib/gemwarrior/entities/items/stalactite.rb
 - lib/gemwarrior/entities/items/stone.rb
 - lib/gemwarrior/entities/items/stonemite.rb
 - lib/gemwarrior/entities/items/tent.rb
 - lib/gemwarrior/entities/items/throne.rb
 - lib/gemwarrior/entities/items/tree.rb
+- lib/gemwarrior/entities/items/ware_hawker.rb
 - lib/gemwarrior/entities/items/waterfall.rb
 - lib/gemwarrior/entities/location.rb
 - lib/gemwarrior/entities/monster.rb