gemwarrior 0.3.1 → 0.3.2

data/lib/gemwarrior/game.rb

@@ -1,42 +1,52 @@
-# lib/gemwarrior/game.rb
-# Main launching point for Gem Warrior
-
-require_relative 'constants'
-require_relative 'world'
-require_relative 'player'
-
-require_relative 'repl'
-require_relative 'evaluator'
-
-module Gemwarrior
-  class Game
-    include AttributePools
-
-    def initialize
-      # create new world and player
-      @world = World.new
-      @player = Player.new(
-        PLYR_LEVEL_DEFAULT,
-        PLYR_XP_DEFAULT,
-        PLYR_HP_CUR_DEFAULT,
-        PLYR_HP_MAX_DEFAULT,
-        PLYR_STAM_CUR_DEFAULT,
-        PLYR_STAM_MAX_DEFAULT,
-        PLYR_ATK_LO_DEFAULT,
-        PLYR_ATK_HI_DEFAULT,
-        Inventory.new,
-        PLYR_ROX_DEFAULT,
-        @world.loc_by_id(0)
-      )
-      @world.player = @player
-
-      # create the console
-      @eval = Evaluator.new(@world)
-      @repl = Repl.new(@world, @eval)
-
-      # enter Jool!
-      @repl.start('look')
-    end
-
-  end
-end
+# lib/gemwarrior/game.rb
+# Main launching point for Gem Warrior
+
+require_relative 'world'
+require_relative 'player'
+
+require_relative 'repl'
+require_relative 'evaluator'
+
+module Gemwarrior
+  class Game
+    # CONSTANTS
+    ## PLAYER DEFAULTS
+    PLYR_LEVEL_DEFAULT = 1
+    PLYR_XP_DEFAULT = 0
+    PLYR_HP_CUR_DEFAULT = 10
+    PLYR_HP_MAX_DEFAULT = 10
+    PLYR_STAM_CUR_DEFAULT = 20
+    PLYR_STAM_MAX_DEFAULT = 20
+    PLYR_ATK_LO_DEFAULT = 1
+    PLYR_ATK_HI_DEFAULT = 2
+    PLYR_ROX_DEFAULT = 0
+
+    attr_accessor :world, :eval, :repl
+    
+    def initialize
+      # create new world and player
+      self.world = World.new
+      world.player = Player.new(
+        PLYR_LEVEL_DEFAULT,
+        PLYR_XP_DEFAULT,
+        PLYR_HP_CUR_DEFAULT,
+        PLYR_HP_MAX_DEFAULT,
+        PLYR_STAM_CUR_DEFAULT,
+        PLYR_STAM_MAX_DEFAULT,
+        PLYR_ATK_LO_DEFAULT,
+        PLYR_ATK_HI_DEFAULT,
+        Inventory.new,
+        PLYR_ROX_DEFAULT,
+        world.loc_by_id(0)
+      )
+
+      # create the console
+      self.eval = Evaluator.new(world)
+      self.repl = Repl.new(world, eval)
+
+      # enter Jool!
+      repl.start('look')
+    end
+
+  end
+end

data/lib/gemwarrior/inventory.rb

@@ -1,61 +1,65 @@
-# lib/gemwarrior/inventory.rb
-# Collection of items a creature possesses
-
-module Gemwarrior
-  class Inventory
-    include Errors
-    
-    def initialize(inventory = [])
-      @inventory = inventory
-    end
-    
-    def list_contents
-      contents_text = "You check your inventory"
-      if @inventory.empty?
-        return contents_text << ERROR_INVENTORY_EMPTY
-      else
-        @item_names = []
-        @inventory.each do |i|
-          @item_names.push(i.name)
-        end
-        return contents_text << ": #{@inventory.map(&:name).join ', '}"
-      end
-    end
-    
-    def describe_item(item_name)
-      if @inventory.map(&:name).include?(item_name)
-        @inventory.each do |i|
-          if i.name.eql?(item_name)
-            return "#{i.description}"
-          end
-        end
-      else
-        ERROR_ITEM_INVENTORY_INVALID
-      end
-    end
-        
-    def add_item(cur_loc, item_name)
-      cur_loc.items.each do |i|
-        if i.name.eql?(item_name)
-          if i.takeable
-            @inventory.push(i)
-            cur_loc.remove_item_from_location(item_name)
-            return "Added #{item_name} to your increasing collection of bits of tid.\n"
-          else
-            ERROR_TAKE_ITEM_UNTAKEABLE
-          end
-        end
-      end
-      ERROR_TAKE_ITEM_INVALID
-    end
-    
-    def remove_item(item_name)
-      if @inventory.map(&:name).include?(item_name)
-        @inventory.reject! { |item| item.name == item_name }
-        puts "The #{item_name} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone.\n"
-      else
-        puts ERROR_INVENTORY_REMOVE_INVALID
-      end
-    end
-  end
-end
+# lib/gemwarrior/inventory.rb
+# Collection of items a creature possesses
+
+module Gemwarrior
+  class Inventory
+    # CONSTANTS
+    ## ERRORS
+    ERROR_INVENTORY_EMPTY       = '...and find you currently have diddly-squat, which is nothing.'
+    ERROR_ITEM_REMOVE_INVALID   = 'Your inventory does not contain that item, so you can\'t drop it.'
+    ERROR_ITEM_ADD_UNTAKEABLE   = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
+    ERROR_ITEM_ADD_INVALID      = 'That item doesn\'t exist here.'
+    ERROR_ITEM_DESCRIBE_INVALID = 'You don\'t possess that.'
+    
+    attr_accessor :inventory
+    
+    def initialize(inventory = [])
+      self.inventory = inventory
+    end
+    
+    def list_contents
+      contents_text = "You check your inventory"
+      if inventory.empty?
+        return contents_text << ERROR_INVENTORY_EMPTY
+      else
+        return contents_text << ": #{inventory.map(&:name).join ', '}"
+      end
+    end
+    
+    def describe_item(item_name)
+      if inventory.map(&:name).include?(item_name)
+        inventory.each do |i|
+          if i.name.eql?(item_name)
+            return "#{i.description}"
+          end
+        end
+      else
+        ERROR_ITEM_DESCRIBE_INVALID
+      end
+    end
+        
+    def add_item(cur_loc, item_name)
+      cur_loc.items.each do |i|
+        if i.name.eql?(item_name)
+          if i.takeable
+            inventory.push(i)
+            cur_loc.remove_item(item_name)
+            return "Added #{item_name} to your increasing collection of bits of tid.\n"
+          else
+            return ERROR_ITEM_ADD_UNTAKEABLE
+          end
+        end
+      end
+      ERROR_ITEM_ADD_INVALID
+    end
+    
+    def remove_item(item_name)
+      if inventory.map(&:name).include?(item_name)
+        inventory.reject! { |item| item.name == item_name }
+        puts "The #{item_name} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone.\n"
+      else
+        ERROR_ITEM_REMOVE_INVALID
+      end
+    end
+  end
+end

data/lib/gemwarrior/item.rb

@@ -1,28 +1,24 @@
-# lib/gemwarrior/item.rb
-# Item base class
-
-require_relative 'constants'
-
-module Gemwarrior
-  class Item
-    include Entities::Items
-    
-    attr_reader :id, :name, :description, :takeable
-    
-    def initialize(
-      id, 
-      name = ITEM_NAME_DEFAULT, 
-      description = ITEM_DESC_DEFAULT,
-      takeable
-    )
-      @id = id
-      @name = name
-      @description = description
-      @takeable = takeable
-    end
-    
-    def is_takeable?
-      @takeable
-    end
-  end
-end
+# lib/gemwarrior/item.rb
+# Item base class
+
+module Gemwarrior
+  class Item
+    attr_accessor :id, :name, :description, :takeable
+    
+    def initialize(
+      id, 
+      name, 
+      description,
+      takeable
+    )
+      self.id = id
+      self.name = name
+      self.description = description
+      self.takeable = takeable
+    end
+    
+    def is_takeable?
+      takeable
+    end
+  end
+end

data/lib/gemwarrior/location.rb

@@ -1,101 +1,110 @@
-# lib/gemwarrior/location.rb
-# Place in the game
-
-require 'matrext'
-
-require_relative 'constants'
-
-module Gemwarrior
-  class Location
-    include Errors
-    
-    attr_reader :id, :name, :description, :locs_connected, :items
-  
-    def initialize(id, name, description, locs_connected, danger_level, items, monsters_available)
-      @id = id
-      @name = name
-      @description = description
-      @locs_connected = locs_connected
-      @danger_level = danger_level
-      @items = items
-      @monsters_available = monsters_available
-      @monsters_abounding = []
-    end
-    
-    def describe
-      desc_text = ""
-      desc_text << "[ #{@name} ]\n"
-      desc_text << @description
-      populate_monsters
-      unless list_items.nil?
-        desc_text << list_items
-      end
-      unless list_monsters.nil?
-        desc_text << list_monsters
-      end
-      return desc_text
-    end
-    
-    def describe_item(item_name)
-      @item_names = []
-      @items.each do |i|
-        @item_names.push(i.name)
-      end
-
-      if @item_names.include?(item_name)
-        @items.each do |i|
-          if i.name.eql?(item_name)
-            puts "#{i.description}"
-            return
-          end
-        end
-      else
-        puts ERROR_ITEM_LOC_INVALID
-      end
-    end
-    
-    def list_items
-      return "\n >> Shiny object(s): #{@items.map(&:name).join(', ')}" if @items.length > 0
-    end
-    
-    def list_monsters
-      return "\n >> Monster(s) abound: #{@monsters_abounding.map(&:name).join(', ')}" if @monsters_abounding.length > 0
-    end
-    
-    def remove_item_from_location(item_name)
-      @items.each do |i|
-        if i.name.eql?(item_name)
-          @items.delete_at(@items.find_index(item_name).to_i)
-        end
-      end
-    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
-      if has_monster?
-        @monsters_abounding = []
-        return @monsters_abounding.push(@monsters_available[rand(0..@monsters_available.length-1)])
-      else
-        return nil
-      end
-    end
-    
-    def has_loc_to_the?(direction)
-      @locs_connected[direction.to_sym]
-    end
-
-  end
-end
+# lib/gemwarrior/location.rb
+# Place in the game
+
+require 'matrext'
+
+module Gemwarrior
+  class Location
+    # CONSTANTS
+    ## HASHES
+    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_ITEM_INVALID = 'You don\'t see that here.'
+
+    attr_accessor :id, :name, :description, :locs_connected, :danger_level, 
+                  :items, :monsters_available, :monsters_abounding, :checked_for_monsters
+  
+    def initialize(id, name, description, locs_connected, danger_level, items, monsters_available)
+      self.id = id
+      self.name = name
+      self.description = description
+      self.locs_connected = locs_connected
+      self.danger_level = danger_level
+      self.items = items
+      self.monsters_available = 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
+
+      return desc_text
+    end
+    
+    def describe_item(item_name)
+      if items.map(&:name).include?(item_name)
+        items.each do |i|
+          if i.name.eql?(item_name)
+            return "#{i.description}"
+          end
+        end
+      else
+        ERROR_LOCATION_DESCRIBE_ITEM_INVALID
+      end
+    end
+    
+    def remove_item(item_name)
+      if items.map(&:name).include?(item_name)
+        items.reject! { |item| item.name == item_name }
+      else
+        ERROR_LOCATION_ITEM_REMOVE_INVALID
+      end
+    end
+
+    def has_loc_to_the?(direction)
+      locs_connected[direction.to_sym]
+    end
+
+    private
+    
+    def checked_for_monsters?
+      checked_for_monsters
+    end
+    
+    def list_items
+      return "\n >> Shiny object(s): #{items.map(&:name).join(', ')}" if items.length > 0
+    end
+    
+    def list_monsters
+      return "\n >> Monster(s) abound: #{monsters_abounding.map(&:name).join(', ')}" if monsters_abounding.length > 0
+    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
+      checked_for_monsters = true
+      if has_monster?
+        self.monsters_abounding = []
+        return monsters_abounding.push(monsters_available[rand(0..monsters_available.length-1)])
+      else
+        return nil
+      end
+    end
+  end
+end