gemwarrior 0.4.1 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638aef0b767f40757bdadab429977bdcd2f23c22
-  data.tar.gz: 9e7a30b926f56dee75605ac92a41a966c6886e7c
+  metadata.gz: dda7511ef167bd6776d0da74d168cb2d99b17635
+  data.tar.gz: ceb694fe92e5528d0ec89a1e312a1878b0058e5f
 SHA512:
-  metadata.gz: a231f1497002ec5a325e913b156595b067a5ccfabd77f966c6e4861d73a07a6197e1dc8ddc096d912c309df82b2bbf34189a80ebe51c99799e567b437580b93e
-  data.tar.gz: ddd8a4352f8e0691a67c6e382221b4a8cbb05c9c3de312f7ab7545e8e82a126e5812fba2fcf81bb4abfe6108a29343d2a0e9df06ee3a50501db8d516af4bfd64
+  metadata.gz: ce465c7fd3627748fdd14891dd203fe96606a39dedf287889ab49e947a3b11492d8a902adabc78273e554cda6fda32a9e9f899468f469d3c028118a095a9f636
+  data.tar.gz: 50f552b9b60c672ed408e9928aa2019aa6850090ac012f9cc9d82f6d4e96c306f17e763d266b402ef8c0ef5e1ecacb8b5cb57718344b1825e522f3a461cc6945

data/lib/gemwarrior/entities/creature.rb

@@ -2,26 +2,21 @@
 # Creature base class
 
 require_relative 'entity'
-require_relative '../inventory'
 
 module Gemwarrior
   class Creature < Entity
-    attr_accessor :id, :name, :description, :face, :hands, :mood, 
-                  :level, :hp_cur, :hp_max, :inventory
-    
-    def initialize(options)
-      self.id           = options[:id]
-      self.name         = options[:name]
-      self.description  = options[:description]
-      self.face         = options[:face]
-      self.hands        = options[:hands]
-      self.mood         = options[:mood]
-
-      self.level        = options[:level]
-      self.hp_cur       = options[:hp_cur]
-      self.hp_max       = options[:hp_max]
-
-      self.inventory    = options[:inventory]
-    end
+    attr_accessor :face, 
+                  :hands, 
+                  :mood, 
+                  :level, 
+                  :xp, 
+                  :hp_cur, 
+                  :hp_max, 
+                  :atk_lo, 
+                  :atk_hi, 
+                  :defense, 
+                  :dexterity, 
+                  :inventory, 
+                  :rox
   end
 end

data/lib/gemwarrior/entities/entity.rb

@@ -3,18 +3,12 @@
 
 module Gemwarrior
   class Entity
-    attr_reader :id, :name, :description
-    
-    def initialize(options)
-      self.id           = options[:id]
-      self.name         = options[:name]
-      self.description  = options[:description]
-    end
-    
+    attr_accessor :name, 
+                  :description
+
     def status
       status_text =  name.ljust(20).upcase
       status_text << "#{description}\n"
-      status_text.to_s
     end
   end
 end

data/lib/gemwarrior/entities/item.rb

@@ -5,18 +5,11 @@ require_relative 'entity'
 
 module Gemwarrior
   class Item < Entity
-    attr_accessor :id, :name, :description, 
-                  :atk_lo, :atk_hi, :takeable, :equippable, :equipped
-    
-    def initialize(options)
-      self.id           = options[:id]
-      self.name         = options[:name]
-      self.description  = options[:description]
-      self.atk_lo       = options[:atk_lo]
-      self.atk_hi       = options[:atk_hi]
-      self.takeable     = options[:takeable]
-      self.equippable   = options[:equippable]
-      self.equipped     = options[:equipped]
-    end
+    attr_accessor :atk_lo, 
+                  :atk_hi, 
+                  :takeable, 
+                  :useable, 
+                  :equippable, 
+                  :equipped
   end
 end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/bed.rb
+# Item::Bed
+
+require_relative '../item'
+
+module Gemwarrior
+  class Bed < Item
+    def initialize
+      self.name         = 'bed'
+      self.description  = 'The place where you sleep when you are not adventuring.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/feather.rb
+# Item::Feather
+
+require_relative '../item'
+
+module Gemwarrior
+  class Feather < Item
+    def initialize
+      self.name         = 'feather'
+      self.description  = 'A blue and green feather. It is soft and tender, unlike the craven bird that probably shed it.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/gun.rb
+# Item::Gun
+
+require_relative '../item'
+
+module Gemwarrior
+  class Gun < Item
+    def initialize
+      self.name         = 'gun'
+      self.description  = 'Pew pew goes this firearm, you suspect.'
+      self.atk_lo       = 3
+      self.atk_hi       = 5
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = true
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/stalactite.rb
+# Item::Stalactite
+
+require_relative '../item'
+
+module Gemwarrior
+  class Stalactite < Item
+    def initialize
+      self.name         = 'stalactite'
+      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.takeable     = true
+      self.useable      = true
+      self.equippable   = true
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/stone.rb
+# Item::Stone
+
+require_relative '../item'
+
+module Gemwarrior
+  class Stone < Item
+    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.takeable     = true
+      self.useable      = true
+      self.equippable   = true
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/tree.rb
+# Item::Tree
+
+require_relative '../item'
+
+module Gemwarrior
+  class Tree < Item
+    def initialize
+      self.name         = 'tree'
+      self.description  = 'A mighty representation of nature, older than your father\'s father\'s second great-uncle.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -12,62 +12,24 @@ module Gemwarrior
     DANGER_LEVEL = {:none => 0, :low => 15, :moderate => 30, :high => 55, :assured => 100}
     
     ## ERRORS
-    ERROR_LOCATION_ITEM_REMOVE_INVALID   = 'That item cannot be removed as it doesn\'t exist here.'
-    ERROR_LOCATION_DESCRIBE_ENTITY_INVALID = 'You don\'t see that here.'
+    ERROR_LOCATION_ITEM_REMOVE_INVALID      = 'That item cannot be removed as it does not exist here.'
+    ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
 
-    attr_accessor :id, :name, :description, :locs_connected, :danger_level, 
-                  :items, :monsters_available, :monsters_abounding, :checked_for_monsters
+    attr_accessor :coords, :locs_connected, :danger_level, :items, 
+                  :monsters_available, :monsters_abounding, :checked_for_monsters
   
     def initialize(options)
-      self.id                   = options[:id]
-      self.name                 = options[:name]
-      self.description          = options[:description]
-      self.locs_connected       = options[:locs_connected]
-      self.danger_level         = options[:danger_level]
-      self.items                = options[:items]
-      self.monsters_available   = options[:monsters_available]
+      self.name                 = options.fetch(:name)
+      self.description          = options.fetch(:description)
+      self.coords               = options.fetch(:coords)
+      self.locs_connected       = options.fetch(:locs_connected)
+      self.danger_level         = options.fetch(:danger_level)
+      self.items                = options.fetch(:items)
+      self.monsters_available   = options.fetch(:monsters_available)
       self.monsters_abounding   = []
       self.checked_for_monsters = false
     end
-    
-    def describe
-      desc_text = ""
-      desc_text << "[ #{name} ]\n"
-      desc_text << description
-      unless checked_for_monsters?
-        populate_monsters
-      end
-      unless list_items.nil?
-        desc_text << list_items
-      end
-      unless list_monsters.nil?
-        desc_text << list_monsters
-      end
-      desc_text << list_paths
 
-      return desc_text
-    end
-    
-    def describe_entity(entity_name)
-      if items.map(&:name).include?(entity_name)
-        items.each do |i|
-          if i.name.eql?(entity_name)
-            return "#{i.description}"
-          end
-        end
-      elsif
-        if monsters_abounding.map(&:name).include?(entity_name)
-          monsters_abounding.each do |m|
-            if m.name.eql?(entity_name)
-              return "#{m.description}"
-            end
-          end
-        end
-      else
-        ERROR_LOCATION_DESCRIBE_ENTITY_INVALID
-      end
-    end
-    
     def remove_item(item_name)
       if items.map(&:name).include?(item_name)
         items.reject! { |item| item.name == item_name }
@@ -77,19 +39,23 @@ module Gemwarrior
     end
 
     def remove_monster(name)
-      if has_monster_to_attack?(name)
-        monsters_abounding.reject! { |monster| monster.name == name }
-      end
+      monsters_abounding.reject! { |monster| monster.name == name }
     end
     
     def has_loc_to_the?(direction)
+      case direction
+      when 'n'
+        direction = 'north'
+      when 'e'
+        direction = 'east'
+      when 's'
+        direction = 'south'
+      when 'w'
+        direction = 'west'
+      end
       locs_connected[direction.to_sym]
     end
 
-    def has_monster_to_attack?(name)
-      monsters_abounding.map(&:name).include?(name.downcase)
-    end
-    
     def monster_by_name(name)
       monsters_abounding.each do |m|
         if m.name.eql?(name)
@@ -98,12 +64,24 @@ module Gemwarrior
       end
     end
     
-    private
-    
     def checked_for_monsters?
       checked_for_monsters
     end
     
+    def has_monster?
+      found = false
+      unless danger_level.eql?(:none)
+        max = DANGER_LEVEL[danger_level]
+        trigger_values = 0..max
+        actual_value = rand(1..100)
+        
+        if trigger_values.include?(actual_value)
+          found = true
+        end
+      end
+      return found
+    end
+    
     def list_items
       return "\n >> Shiny object(s): #{items.map(&:name).join(', ')}" if items.length > 0
     end
@@ -115,32 +93,18 @@ module Gemwarrior
     def list_paths
       valid_paths = []
       locs_connected.each do |key, value|
-        unless value.nil?
+        if value
           valid_paths.push(key.to_s)
         end
       end
       return "\n >> Paths: #{valid_paths.join(', ')}"
     end
     
-    def has_monster?
-      found = false
-      unless danger_level.eql?(:none)
-        max = DANGER_LEVEL[danger_level]
-        trigger_values = 0..max
-        actual_value = rand(1..100)
-        
-        if trigger_values.include?(actual_value)
-          found = true
-        end
-      end
-      return found
-    end
-  
     def populate_monsters
       self.checked_for_monsters = true
       if has_monster?
         self.monsters_abounding = []
-        return monsters_abounding.push(monsters_available[rand(0..monsters_available.length-1)])
+        monsters_abounding.push(monsters_available[rand(0..monsters_available.length-1)])
       else
         return nil
       end

data/lib/gemwarrior/entities/monster.rb

@@ -5,44 +5,21 @@ require_relative 'creature'
 
 module Gemwarrior
   class Monster < Creature
-    attr_accessor :xp, :atk_hi, :atk_lo, :dexterity, 
-                  :rox_to_give, :xp_to_give, :battlecry
-  
-    def initialize(options)
-      self.id           = options[:id]
-      self.name         = options[:name]
-      self.description  = options[:description]
-      self.face         = options[:face]
-      self.hands        = options[:hands]
-      self.mood         = options[:mood]
-      
-      self.level        = options[:level]
-      self.hp_cur       = options[:hp_cur]
-      self.hp_max       = options[:hp_max]
-      
-      self.atk_lo       = options[:atk_lo]
-      self.atk_hi       = options[:atk_hi]
-      self.dexterity    = options[:dexterity]
-      
-      self.inventory    = options[:inventory]
-      self.rox_to_give  = options[:rox_to_give]
-      self.xp_to_give   = options[:xp_to_give]
-      
-      self.battlecry    = options[:battlecry]
-    end
-    
+    attr_accessor :battlecry
+
     def describe
-      status_text =  name.upcase.ljust(13)
+      status_text =  name.upcase.ljust(20)
       status_text << "LEVEL: #{level.to_s.rjust(2)}, "
-      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)}, "
-      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)}, "
-      status_text << "DEX: #{dexterity.to_s.rjust(3)}, "
-      status_text << "XP: #{xp_to_give.to_s.rjust(3)}, "
-      status_text << "ROX: #{rox_to_give.to_s.rjust(3)}, "
-      status_text << "FACE: #{face.ljust(10)}, "
-      status_text << "HANDS: #{hands.ljust(10)}, "
+      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)} "
+      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} "
+      status_text << "DEF: #{defense.to_s.rjust(2)} "
+      status_text << "DEX: #{dexterity.to_s.rjust(2)} "
+      status_text << "INV: #{inventory.list_contents} "
+      status_text << "ROX: #{rox.to_s.rjust(3)} "
+      status_text << "XP: #{xp.to_s.rjust(3)} "
+      status_text << "FACE: #{face.ljust(10)} "
+      status_text << "HANDS: #{hands.ljust(11)} "
       status_text << "MOOD: #{mood.ljust(10)}\n"
-      status_text.to_s
     end
     
     def take_damage(dmg)