gemwarrior 0.12.8 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87721fdd2ec0064a907a6178832b27955eecc508
-  data.tar.gz: 66045234ba9735ce29539b85bb0fa38392099151
+  metadata.gz: a8852ede6b54154910b456a93563fd38d21b7c34
+  data.tar.gz: acc043b05762adf247195338f62f70018cb31517
 SHA512:
-  metadata.gz: 8df7613868ebb152e5e2ddb9f8136840d67df56ce3bf50e0f9c91d0b1125aaef9bc0d760ad2bab386407f0168a9d10e65a82d3d280a6ba64cb41806d23487321
-  data.tar.gz: 18377d6edc2b4c575c70a13d4d7bda1f9d4babfd9879042d96e84a587de29adc4f986af0b5ecc069722f3b8342126afd56d07b4eea586052ce677bfc984bf94c
+  metadata.gz: 0b5930f7c5f031aee95ac2fe2e1733498392c82aa6cb4d92e523a5bebd3aa8ecefb5154b062d3341e9195b05ee1485fe9a33b5f4e1c21be9b0a02f072d930932
+  data.tar.gz: dca3af60864d92da16fa3bd9d02fc6034b57f423c3cda3fd1afc2db76e2e3ad137a68713b0cecfbf47fe84f3cdbc327fe04d1f1e33ba1b85947ae1cb6a40796f

data/data/default_world.yaml

@@ -3,7 +3,7 @@ locations:
 - !ruby/object:Gemwarrior::Location
   name: home
   name_display: Home
-  description: The little, unimportant, decrepit shack that you live in. What it lacks in decisive magnanimity, it makes up for it in its cozy squalidness. Nearby, you notice a curious letter, folded in three.
+  description: The little, unimportant, decrepit shack that you live in. What the place lacks in decisive magnanimity is made up for in cozy squalidness. Your bed covers much of the northern corner. Your beloved family chest sits at the foot of the bed.
   coords: &2
     :x: 5
     :y: 0
@@ -20,6 +20,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: bed
     name_display: Bed
@@ -28,10 +29,24 @@ locations:
     talkable: false
     useable: true
     equippable: false
+  - !ruby/object:Gemwarrior::Chest
+    equipped: false
+    consumable: false
+    used: false
+    used_again: false
+    number_of_uses: 
+    name: chest
+    name_display: Chest
+    description: Well-crafted with solid oak, this family chest has intricate inlays all around the front and sides. It's the one thing from home you took with you when you left.
+    takeable: false
+    talkable: false
+    useable: true
+    equippable: false
   - !ruby/object:Gemwarrior::Letter
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: letter
     name_display: Letter
@@ -44,6 +59,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: stone
     name_display: Stone
@@ -55,10 +71,12 @@ locations:
     useable: true
     equippable: true
     is_weapon: true
+    dex_mod: 0
   - !ruby/object:Gemwarrior::Tent
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 5
     name: tent
     name_display: Tent
@@ -117,6 +135,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: stalactite
     name_display: Stalactite
@@ -132,6 +151,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: stonemite
     name_display: Stonemite
@@ -190,6 +210,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: ladder
     name_display: Ladder
@@ -419,6 +440,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: small_hole
     name_display: Small Hole
@@ -480,6 +502,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: rope
     name_display: Rope
@@ -631,6 +654,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: snowman
     name_display: Snowman
@@ -757,6 +781,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: map
     name_display: Map
@@ -792,6 +817,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: tree
     name_display: Tree
@@ -799,7 +825,7 @@ locations:
       second great-uncle.
     takeable: false
     talkable: false
-    useable: false
+    useable: true
     equippable: false
   monsters_abounding: []
   bosses_abounding: []
@@ -850,6 +876,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: feather
     name_display: Feather
@@ -885,6 +912,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: bookcase
     name_display: Bookcase
@@ -1007,6 +1035,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: false
     name: sand_jewel
@@ -1178,6 +1207,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: arena_door
     name_display: Arena Door
@@ -1214,6 +1244,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: arena_master
@@ -1269,6 +1300,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: false
     name: hut
@@ -1414,7 +1446,20 @@ locations:
     begin: 1
     end: 2
     excl: false
-  items: []
+  items:
+  - !ruby/object:Gemwarrior::Bullet
+    equipped: false
+    consumable: false
+    used: false
+    used_again: false
+    number_of_uses: 
+    talkable: false
+    name: bullet
+    name_display: Bullet
+    description: Gunpowder packed into a small metallic tube, ready to be fired from...something.
+    takeable: true
+    useable: true
+    equippable: false
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false
@@ -1439,6 +1484,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: ware_hawker
@@ -1473,6 +1519,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: thin_man
@@ -1488,6 +1535,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: drunk_man
@@ -1522,6 +1570,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: pig
@@ -1534,6 +1583,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: cow
@@ -1546,6 +1596,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: goat
@@ -1580,6 +1631,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     talkable: true
     name: shifty_woman
@@ -1617,6 +1669,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: gun
     name_display: Gun
@@ -1632,6 +1685,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: pedestal
     name_display: Pedestal
@@ -1691,6 +1745,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: floor_tile
     name_display: Floor Tile
@@ -1726,6 +1781,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: flower
     name_display: Flower
@@ -1739,6 +1795,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: keystone
     name_display: Keystone
@@ -1752,6 +1809,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: pond
     name_display: Pond
@@ -1790,6 +1848,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: dehumidifier
     name_display: Dehumidifier
@@ -1847,6 +1906,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: waterfall
     name_display: Waterfall
@@ -1883,6 +1943,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: massive_door
     name_display: Massive Door
@@ -1920,6 +1981,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: throne
     name_display: Throne
@@ -1955,6 +2017,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: couch
     name_display: Couch
@@ -2013,6 +2076,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: apple
     name_display: Apple
@@ -2025,6 +2089,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: cup
     name_display: Cup
@@ -2057,6 +2122,7 @@ locations:
     equipped: false
     consumable: false
     used: false
+    used_again: false
     number_of_uses: 
     name: queen_ruby
     description: Queen Ruby glimmers like she was made from the substance of her name. She wears a wan smile, and her hands are delicately intertwined as she sits patiently.
@@ -2081,7 +2147,7 @@ player: !ruby/object:Gemwarrior::Player
   atk_lo: 1
   atk_hi: 2
   defense: 1
-  dexterity: 1
+  dexterity: 3
   inventory: !ruby/object:Gemwarrior::Inventory
     armor: 
     items: []

data/lib/gemwarrior/battle.rb

@@ -237,6 +237,11 @@ module Gemwarrior
         attempt_success_hi += rand((a_dex)..(a_dex+2))
         attempt_success_hi -= rand((d_dex)..(d_dex+2))
 
+        # weapon can change dexterity
+        if player.has_weapon_equipped?
+          attempt_success_hi += player.weapon.dex_mod
+        end
+
         # compute attempt success
         attempt = rand(attempt_success_lo..attempt_success_hi)
         miss_cap = MISS_CAP_DEFAULT

data/lib/gemwarrior/entities/armor.rb

@@ -19,15 +19,21 @@ module Gemwarrior
       'Save the donning of this piece of armor for battle.'
     end
 
-    def describe
+    def describe_detailed
       desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
       desc_text << "(#{name})\n".colorize(:green)
       desc_text << "#{description}\n".colorize(:white)
+      desc_text << "ARMOR?      #{is_armor}\n".colorize(:white)
       desc_text << "DEFENSE:    #{defense}\n".colorize(:white)
       desc_text << "TAKEABLE?   #{takeable}\n".colorize(:white)
       desc_text << "USEABLE?    #{useable}\n".colorize(:white)
+      desc_text << "TALKABLE?   #{talkable}\n".colorize(:white)
+      desc_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
       desc_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
       desc_text << "EQUIPPED?   #{equipped}\n".colorize(:white)
+      desc_text << "USED?       #{used}\n".colorize(:white)
+      desc_text << "USED AGAIN? #{used_again}\n".colorize(:white)
+      desc_text << "USES LEFT?  #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
       desc_text
     end
   end

data/lib/gemwarrior/entities/armor/leather_jerkin.rb

@@ -0,0 +1,17 @@
+# lib/gemwarrior/entities/armor/leather_jerkin.rb
+# Entity::Item::Armor::LeatherJerkin
+
+require_relative '../armor'
+
+module Gemwarrior
+  class LeatherJerkin < Armor
+    def initialize
+      super
+
+      self.name         = 'leather_jerkin'
+      self.name_display = 'Leather Jerkin'
+      self.description  = 'Brownish-black in color and fairly form-fitting, this jerkin will soften any blow a bit, at least.'
+      self.defense      = 2
+    end
+  end
+end

data/lib/gemwarrior/entities/entity.rb

@@ -18,6 +18,7 @@ module Gemwarrior
                   :equippable,
                   :equipped,
                   :used,
+                  :used_again,
                   :number_of_uses
 
     attr_reader   :describe,
@@ -36,6 +37,7 @@ module Gemwarrior
       self.equippable     = false
       self.equipped       = false
       self.used           = false
+      self.used_again     = false
       self.number_of_uses = nil
     end
 
@@ -58,6 +60,7 @@ module Gemwarrior
       desc_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
       desc_text << "EQUIPPED?   #{equipped}\n".colorize(:white)
       desc_text << "USED?       #{used}\n".colorize(:white)
+      desc_text << "USED AGAIN? #{used_again}\n".colorize(:white)
       desc_text << "USES LEFT?  #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
       desc_text
     end

data/lib/gemwarrior/entities/item.rb

@@ -20,5 +20,23 @@ module Gemwarrior
     def use(world)
       'That item does not do anything...yet.'
     end
+    
+    def describe_detailed
+      desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
+      desc_text << "(#{name})\n".colorize(:green)
+      desc_text << "#{description}\n".colorize(:white)
+      desc_text << "ARMOR?      #{is_armor}\n".colorize(:white)
+      desc_text << "WEAPON?     #{is_weapon}\n".colorize(:white)
+      desc_text << "TAKEABLE?   #{takeable}\n".colorize(:white)
+      desc_text << "USEABLE?    #{useable}\n".colorize(:white)
+      desc_text << "TALKABLE?   #{talkable}\n".colorize(:white)
+      desc_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
+      desc_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
+      desc_text << "EQUIPPED?   #{equipped}\n".colorize(:white)
+      desc_text << "USED?       #{used}\n".colorize(:white)
+      desc_text << "USED AGAIN? #{used_again}\n".colorize(:white)
+      desc_text << "USES LEFT?  #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
+      desc_text
+    end
   end
 end

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

@@ -0,0 +1,40 @@
+# lib/gemwarrior/entities/items/chest.rb
+# Entity::Item::Chest
+
+require_relative '../item'
+
+module Gemwarrior
+  class Chest < Item
+    def initialize
+      super
+
+      self.name         = 'chest'
+      self.name_display = 'Chest'
+      self.description  = 'Well-crafted with solid oak, this family chest has intricate inlays all around the front and sides. It\'s the one thing from home you took with you when you left.'
+    end
+
+    def use(world)
+      home = world.location_by_name('home')
+      open_description = 'You open the chest and find little inside but some dust and faded memories of your childhood.'
+
+      if self.used
+        if home.contains_item?('leather_jerkin')
+          open_description += ' The old sword fighting garment is still in there, too.'
+        end
+        puts open_description
+
+        { type: nil, data: nil }
+      else
+        open_description += ' That, and a slightly dirty, but still useful garment you remember using while taking those sword fighting lessons as a small boy.'
+
+        puts open_description
+
+        home.items.push(LeatherJerkin.new)
+
+        self.used = true
+
+        { type: nil, data: nil }
+      end
+    end
+  end
+end

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

@@ -12,5 +12,30 @@ module Gemwarrior
       self.name_display = 'Tree'
       self.description  = 'A mighty representation of nature, older than your father\'s father\'s second great-uncle.'
     end
+    
+    def use(world)
+      if self.used_again
+        puts 'The tree, its trunk, and the hole in its side all seem fairly unremarkable to you now.'
+
+        return { type: nil, data: nil }
+      elsif self.used
+        self.used_again = true
+        
+        puts 'Looking further into the small opening in the trunk your eye catches the light glinting off a few small metallic objects.'
+
+        cur_loc = world.location_by_name('forest-southeast')
+        cur_loc.items.push(Bullet.new)
+        cur_loc.items.push(Bullet.new)
+        cur_loc.items.push(Bullet.new)
+
+        return { type: nil, data: nil }
+      else
+        self.used = true
+
+        puts 'Taking a passing glance into the only hole in the tree big enough for anything to exist inside, you don\'t quite see anything of value.'
+
+        { type: nil, data: nil }
+      end
+    end
   end
 end

data/lib/gemwarrior/entities/monsters/bosses/jaspern.rb

@@ -32,6 +32,10 @@ module Gemwarrior
       self.is_boss      = true
     end
 
+    def use(world)
+      speak('You are not going any further north, little man. No matter of talking will move me!')
+    end
+
     def river_bridge_success(world)
       # get object references
       river_bridge = world.location_by_name('river_bridge')

data/lib/gemwarrior/entities/player.rb

@@ -52,20 +52,24 @@ module Gemwarrior
         print_char_pic
       end
 
-      weapon_slot   = '(unarmed)'
-      armor_slot    = '(unarmored)'
-      base_atk_lo   = self.atk_lo
-      base_atk_hi   = self.atk_hi
-      base_defense  = self.defense
-      net_atk_lo    = nil
-      net_atk_hi    = nil
-      net_defense   = nil
+      weapon_slot     = '(unarmed)'
+      armor_slot      = '(unarmored)'
+      base_atk_lo     = self.atk_lo
+      base_atk_hi     = self.atk_hi
+      base_defense    = self.defense
+      base_dexterity  = self.dexterity
+      net_atk_lo      = nil
+      net_atk_hi      = nil
+      net_defense     = nil
+      net_dexterity   = nil
 
       # juice the weapon display
       if has_weapon_equipped?
-        weapon_slot = inventory.weapon.name
-        net_atk_lo = base_atk_lo + inventory.weapon.atk_lo
-        net_atk_hi = base_atk_hi + inventory.weapon.atk_hi
+      binding.pry
+        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
       end
 
       # juice the armor display
@@ -84,7 +88,8 @@ module Gemwarrior
         end
       end
 
-      self_text =  "NAME      : #{self.name}\n"
+      self_text =  "\n"
+      self_text << "NAME      : #{self.name.colorize(:green)}\n"
       self_text << "LEVEL     : #{self.level}\n"
       self_text << "EXPERIENCE: #{self.xp}\n"
       self_text << "HIT POINTS: #{self.hp_cur}/#{self.hp_max}\n"
@@ -96,11 +101,16 @@ module Gemwarrior
       self_text << "DEFENSE   : #{base_defense}"
       self_text << " (#{net_defense} w/ #{armor_slot})".colorize(:yellow) unless net_defense.nil?
       self_text << "\n"
-      self_text << "DEXTERITY : #{self.dexterity}\n"
+      self_text << "DEXTERITY : #{self.dexterity}"
+      self_text << " (#{net_dexterity} w/ #{weapon_slot})".colorize(:yellow) unless net_dexterity.nil?
+      self_text << "\n"
       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"
         self_text << ">> POSITION       : #{self.cur_coords.values.to_a}\n"
         self_text << ">> GOD_MODE       : #{GameOptions.data['god_mode']}\n"
         self_text << ">> BEAST_MODE     : #{GameOptions.data['beast_mode']}\n"
@@ -114,11 +124,11 @@ module Gemwarrior
 
       self_text << "\n"
 
-      self_text << "[Your Story]\n#{self.description}"
+      self_text << "[#{"Your Story".colorize(:yellow)}]\n#{self.description}"
 
       self_text << "\n\n"
 
-      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and feeling, generally, #{self.mood.colorize(:yellow)}."
+      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

data/lib/gemwarrior/entities/weapon.rb

@@ -7,6 +7,7 @@ module Gemwarrior
   class Weapon < Item
     attr_accessor :atk_lo,
                   :atk_hi,
+                  :dex_mod,
                   :is_weapon
 
     def initialize
@@ -14,24 +15,31 @@ module Gemwarrior
 
       self.atk_lo       = 0
       self.atk_hi       = 0
+      self.dex_mod      = 0
       self.takeable     = true
       self.equippable   = true
       self.is_weapon    = true
     end
 
     def use(world)
-      'Save the using of your weapon for battle.'
+      'Save the brrandishing of your weapon for battle.'
     end
 
     def describe_detailed
       desc_text =  "\"#{name_display}\"\n".colorize(:yellow)
       desc_text << "(#{name})\n".colorize(:green)
       desc_text << "#{description}\n".colorize(:white)
-      desc_text << "ATTACK_RANGE: #{atk_lo}-#{atk_hi}\n".colorize(:white)
-      desc_text << "TAKEABLE?     #{takeable}\n".colorize(:white)
-      desc_text << "USEABLE?      #{useable}\n".colorize(:white)
-      desc_text << "EQUIPPABLE?   #{equippable}\n".colorize(:white)
-      desc_text << "EQUIPPED?     #{equipped}\n".colorize(:white)
+      desc_text << "WEAPON?         #{is_weapon}\n".colorize(:white)
+      desc_text << "ATTACK_RANGE  : #{atk_lo}-#{atk_hi}\n".colorize(:white)
+      desc_text << "TAKEABLE?   #{takeable}\n".colorize(:white)
+      desc_text << "USEABLE?    #{useable}\n".colorize(:white)
+      desc_text << "TALKABLE?   #{talkable}\n".colorize(:white)
+      desc_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
+      desc_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
+      desc_text << "EQUIPPED?   #{equipped}\n".colorize(:white)
+      desc_text << "USED?       #{used}\n".colorize(:white)
+      desc_text << "USED AGAIN? #{used_again}\n".colorize(:white)
+      desc_text << "USES LEFT?  #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
       desc_text
     end
   end

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

@@ -13,6 +13,12 @@ module Gemwarrior
       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       = 1
       self.atk_hi       = 3
+      self.dex_mod      = 1
+    end
+
+    def use(world)
+      puts 'You graze the blade of the dagger lightly and find it to be plenty sharp.'
+      { type: nil, data: nil }
     end
   end
 end

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

@@ -13,6 +13,7 @@ module Gemwarrior
       self.description  = 'Pew pew goes this firearm, you suspect (if it has bullets).'
       self.atk_lo       = 2
       self.atk_hi       = 6
+      self.dex_mod      = 2
     end
 
     def use(world)

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

@@ -13,6 +13,7 @@ module Gemwarrior
       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.dex_mod      = -2
     end
     
     def use(world)

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

@@ -13,6 +13,7 @@ module Gemwarrior
       self.description  = 'Gleaming with supernatural light, this object feels alien, yet familiar.'
       self.atk_lo       = 9
       self.atk_hi       = 11
+      self.dex_mod      = 2
     end
 
     def use(world)

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

@@ -13,6 +13,7 @@ module Gemwarrior
       self.description  = 'About six feet in length and razor-sharp at the point, this spear requires two hands, but only one good stab.'
       self.atk_lo       = 3
       self.atk_hi       = 7
+      self.dex_mod      = -1
     end
 
     def use(world)

data/lib/gemwarrior/entities/weapons/stalactite.rb

@@ -13,6 +13,12 @@ module Gemwarrior
       self.description  = 'Long protrusion of cave adornment, broken off and fallen to the ground, where the stalagmites sneer at it from.'
       self.atk_lo       = 2
       self.atk_hi       = 3
+      self.dex_mod      = -1
+    end
+
+    def use(world)
+      puts 'You wave the stalactite around in the air a bit, testing its weight and precision. It is a thin, long piece of rock taken from a cave wall, for sure, though.'
+      { type: nil, data: nil }
     end
   end
 end

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

@@ -13,6 +13,7 @@ module Gemwarrior
       self.description  = 'A small, yet quite sharp, sedimentary pebble, suitable for tossing in amusement, and perhaps combat.'
       self.atk_lo       = 1
       self.atk_hi       = 2
+      self.dex_mod      = -1
     end
     
     def use(world)

data/lib/gemwarrior/inventory.rb

@@ -8,7 +8,7 @@ module Gemwarrior
     # CONSTANTS
     ERROR_ITEM_REMOVE_INVALID       = 'Your inventory does not contain that item, so you cannot drop it.'
     ERROR_ITEM_ADD_UNTAKEABLE       = 'That would be great if you could take that, wouldn\'t it? Huh!'
-    ERROR_ITEM_ADD_INVALID          = 'That item cannot be added.'
+    ERROR_ITEM_ADD_INVALID          = 'That item cannot be taken or does not exist.'
     ERROR_ITEM_DESCRIBE_INVALID     = 'That does not seem to be in the inventory.'
     ERROR_ITEM_EQUIP_INVALID        = 'You do not possess anything called that to equip.'
     ERROR_ITEM_EQUIP_NONARMAMENT    = 'That item cannot be equipped.'
@@ -49,13 +49,13 @@ module Gemwarrior
         if item_hash.length == 1
           i = item_hash.keys.join
           q = item_hash.values.join.to_i
-          return q > 1 ? "#{q} #{i}s" : i
+          return q > 1 ? "#{i}s x#{q}" : i
         # multiple items? return array of strings to mush together
         else
           item_arr = []
           item_hash.each do |i, q|
             if q > 1
-              item_arr.push("#{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)} x#{q}")
+              item_arr.push("#{i}s x#{q}")
             else
               item_arr.push(i)
             end
@@ -203,9 +203,6 @@ module Gemwarrior
             if i.takeable
               self.items.push(i)
               cur_loc.remove_item(item_name)
-              if cur_loc.name.eql?('home')
-                cur_loc.description = 'The little, unimportant, decrepit shack that you live in. What it lacks in decisive magnanimity, it makes up for it in its cozy squalidness.'
-              end
 
               # stats
               player.items_taken += 1

data/lib/gemwarrior/misc/player_levels.rb

@@ -10,7 +10,7 @@ module Gemwarrior
           level:    1,   xp_start:   0,
           hp_max:   30,  stam_max:   20, 
           atk_lo:   1,   atk_hi:     2, 
-          defense:  1,   dexterity:  1,
+          defense:  1,   dexterity:  3,
           special_abilities: nil
         }
       when 2
@@ -18,7 +18,7 @@ module Gemwarrior
           level:    2,   xp_start:   50,
           hp_max:   35,  stam_max:   25, 
           atk_lo:   2,   atk_hi:     3, 
-          defense:  3,   dexterity:  3,
+          defense:  3,   dexterity:  4,
           special_abilities: :rocking_vision
         }
       when 3

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -33,7 +33,20 @@ module Gemwarrior
       end
 
       desc_text << "\n"
-      desc_text << point.description
+
+      point_desc = point.description.clone
+      
+      # specific location description changes
+      if point.name.eql?('home')
+        if point.contains_item?('tent')
+          point_desc << ' Next to the bed, on the floor, is a folded-up tent.'
+        end
+        if point.contains_item?('letter')
+          point_desc << ' Atop the chest you notice a curious letter, folded in three.'
+        end
+      end
+
+      desc_text << point_desc
 
       point.populate_monsters(GameMonsters.data) unless point.checked_for_monsters?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.13.0
 platform: ruby
 authors:
 - Michael Chadwick
@@ -276,6 +276,7 @@ files:
 - lib/gemwarrior/battle.rb
 - lib/gemwarrior/entities/armor.rb
 - lib/gemwarrior/entities/armor/iron_helmet.rb
+- lib/gemwarrior/entities/armor/leather_jerkin.rb
 - lib/gemwarrior/entities/creature.rb
 - lib/gemwarrior/entities/creatures/cow.rb
 - lib/gemwarrior/entities/creatures/goat.rb
@@ -287,6 +288,7 @@ files:
 - lib/gemwarrior/entities/items/bed.rb
 - lib/gemwarrior/entities/items/bookcase.rb
 - lib/gemwarrior/entities/items/bullet.rb
+- lib/gemwarrior/entities/items/chest.rb
 - lib/gemwarrior/entities/items/couch.rb
 - lib/gemwarrior/entities/items/cup.rb
 - lib/gemwarrior/entities/items/dehumidifier.rb