general cleanup of render

start to work on fighting the enemy unit

lib/game.rb

@@ -35,7 +35,7 @@ def play
     @render.draw_message(@engine)
   end
 
-  def run_thread(pause=0.05)
+  def run_thread(pause=0.03)
     Thread.new do
       loop do
         yield

lib/game/engine.rb

@@ -21,6 +21,8 @@ def map
     end
 
     def take_turn
+      active_objects = Game::Object.engine_objects(map.name)[Game::Object::ACTIVE]
+      active_objects.each {|obj| obj.active_turn }
     end
 
     def ended?

lib/game/input.rb

@@ -18,6 +18,11 @@ def bind_keys
       bind_key(:a) { @player.move(Game::Map::EAST) }
       bind_key(:d) { @player.move(Game::Map::WEST) }
 
+      bind_key(:W) { @player.move(Game::Map::NORTH) }
+      bind_key(:S) { @player.move(Game::Map::SOUTH) }
+      bind_key(:A) { @player.move(Game::Map::EAST) }
+      bind_key(:D) { @player.move(Game::Map::WEST) }
+
       bind_key(:' ') { @player.take_action }
 
       bind_key(:'1') { skip_to('level5') }

lib/game/modules.rb

@@ -1,3 +1,4 @@
 require 'lib/game/modules/object_management'
 require 'lib/game/modules/try_helper'
-require 'lib/game/modules/instance_setter'
+require 'lib/game/modules/instance_setter'
+require 'lib/game/modules/impassible'

lib/game/modules/impassible.rb

@@ -0,0 +1,9 @@
+class Game
+  module Modules
+    module Impassible
+      def passible?(player_objects=[])
+        false
+      end
+    end
+  end
+end

lib/game/modules/instance_setter.rb

@@ -6,6 +6,7 @@ def self.included(base)
       end
 
       def initialize(*args)
+        super(*args)
         self.class.set(self)
       end
 

lib/game/modules/object_management.rb

@@ -2,11 +2,19 @@ class Game
   module Modules
     module ObjectManagement
       def add(object)
-        object.tile = self
+        if self.is_a?(Game::Player)
+          object.player = self if object.respond_to?(:player)
+          object.tile = nil
+        else
+          object.player = nil if object.respond_to?(:player)
+          object.tile = self
+        end
         @objects << object
       end
 
       def remove(object)
+        object.player = nil if object.respond_to?(:player)
+        object.tile = nil
         @objects.delete(object)
       end
 

lib/game/object.rb

@@ -1,4 +1,5 @@
 require 'lib/game/object/selector'
+require 'lib/game/object/status'
 
 require 'lib/game/object/default'
 require 'lib/game/object/enemy'
@@ -52,6 +53,10 @@ def add(level, status, obj)
         engine_objects(level)[status] << obj
       end
 
+      def remove(level, status, obj)
+        engine_objects(level)[status].delete(obj)
+      end
+
       def clear
         @game_objects = {}
         @objects = []

lib/game/object/default.rb

@@ -2,12 +2,12 @@ class Game
   class Object
     module Default
       def self.included(base)
-        base.send :attr_accessor, :tile
+        base.send :attr_accessor, :tile, :player
       end
 
       def initialize(options)
-        super
         @options = options
+        super
       end
 
       def id
@@ -19,6 +19,10 @@ def method_missing(method, *args, &blk)
           super
         end
       end
+
+      def respond_to?(method)
+        @options.has_key?(method.to_s) || super
+      end
     end
   end
 end

lib/game/object/enemy.rb

@@ -2,25 +2,35 @@ class Game
   class Object
     module Enemy
       def self.included(base)
-        base.send :attr_reader, :direction
+        base.send :include, Game::Object::Status
+        base.send :include, Game::Modules::Impassible
+
+        base.send :attr_reader, :direction, :hp, :status
       end
 
       def initialize(*args)
         super
         @direction = Game::Map::NORTH
+        @hp = @options['health'] || 100
+        @status ||= Game::Object::IDLE
         Game::Object.add(Game::Engine.instance.map.name, status, self)
       end
 
-      def passible?
-        false
-      end
+      def damage(hp)
+        activate if status == Game::Object::IDLE
 
-      def range
-        @options['range'] || 4
+        if hp >= @hp
+          @hp = 0
+          expire
+        else
+          @hp -= hp
+        end
       end
 
-      def status
-        @status ||= Game::Object::IDLE
+      def move_to(tile)
+        @tile.remove(self)
+        @tile = tile
+        @tile.add(self)
       end
 
       def active_turn
@@ -30,18 +40,14 @@ def active_turn
         if player_in_front?
           Game::Player.instance.damage(attack)
         elsif !player_in_range?
-          Game::Object.remove(Game::Engine.instance.map.name, status, self)
-          @status = Game::Object::IDLE
-          Game::Object.add(Game::Engine.instance.map.name, status, self)
+          deactivate
         elsif (tile = @tile.at(@direction)).passible?
           move_to(tile)
         end
       end
 
-      def move_to(tile)
-        @tile.remove(self)
-        @tile = tile
-        @tile.add(self)
+      def range
+        @options['range'] || 4
       end
 
       def player_in_range?

lib/game/object/inventry_item.rb

@@ -6,7 +6,7 @@ def id
       end
 
       def name
-        @options['name'] || self.class.to_s
+        @options['name'] || self.class.to_s.split('::').last
       end
 
       def use

lib/game/object/status.rb

@@ -0,0 +1,27 @@
+class Game
+  class Object
+    module Status
+      def status
+        @status ||= Game::Object::IDLE
+      end
+
+      def expire
+        tile.remove(self)
+        Game::Object.remove(Game::Engine.instance.map.name, status, self)
+        Game::Object.objects.delete(self)
+      end
+
+      def activate
+        Game::Object.remove(Game::Engine.instance.map.name, status, self)
+        @status = Game::Object::ACTIVE
+        Game::Object.add(Game::Engine.instance.map.name, status, self)
+      end
+
+      def deactivate
+        Game::Object.remove(Game::Engine.instance.map.name, status, self)
+        @status = Game::Object::IDLE
+        Game::Object.add(Game::Engine.instance.map.name, status, self)
+      end
+    end
+  end
+end

lib/game/object/weapon.rb

@@ -5,8 +5,11 @@ def equip
         Game::Player.instance.equip('weapon', self)
       end
 
-      def attack
-
+      def use
+        tile = player.tile.at(Game::Player.instance.direction)
+        if object = tile.objects.detect {|obj| obj.respond_to?(:damage) }
+          object.damage(attack)
+        end
       end
     end
   end

lib/game/player.rb

@@ -12,8 +12,8 @@ class Player
     attr_reader :objects
     attr_reader :hp
 
-    def initialize
-      super
+    def initialize(*args)
+      super(*args)
       @objects = []
       @hp = 100
     end

lib/game/player/actions.rb

@@ -6,9 +6,8 @@ def take_action
           tile.remove(obj)
           add(obj)
         end
-        objects_to_responding_to(:process).each do |obj|
-          obj.process
-        end
+        objects_to_responding_to(:process).each(&:process)
+        weapons.each(&:use)
       end
 
       def take_auto_action
@@ -26,6 +25,11 @@ def objects_to_responding_to(method)
         tile.objects.select {|obj| obj.respond_to?(method) }
       end
       private :objects_to_responding_to
+
+      def weapons
+        objects.select {|obj| obj.is_a?(Game::Object::Weapon) }
+      end
+      private :weapons
     end
   end
 end

lib/game/player/movements.rb

@@ -5,6 +5,11 @@ def self.included(base)
         base.send :attr_reader, :direction
       end
 
+      def initialize(*args)
+        super(*args)
+        @direction = Game::Map::NORTH
+      end
+
       def load_map(map)
         @map = map
         @tile = @map.start_tile

lib/game/tile.rb

@@ -1,4 +1,4 @@
-require 'lib/game/tile/modules'
+require 'lib/game/tile/base'
 require 'lib/game/tile/movement'
 require 'lib/game/tile/passible'
 

lib/game/tile/modules.rb → lib/game/tile/base.rb

@@ -1,24 +1,13 @@
 class Game
   class Tile
-    module Impassible
-      def passible?(player_objects)
-        false
-      end
-    end
-
-    module Passible
-      def passible?(player_objects)
-        objects.all?(&:passible?)
-      end
-    end
-
     module Base
       def self.included(base)
         base.send :attr_accessor, :tile_type
         base.send :attr_reader, :objects, :x, :y
       end
 
       def initialize(tile_type, x, y)
+        super
         @tile_type = tile_type
         @x = x
         @y = y

lib/game/tile/edge.rb

@@ -1,14 +1,23 @@
 class Game
   class Tile
     class Edge
+      include Game::Modules::ObjectManagement
       include Game::Tile::Base
-      include Game::Tile::Impassible
+      include Game::Modules::Impassible
 
       def self.instance
         @self ||= new
       end
 
-      def initialize; end
+      def initialize
+        @objects = []
+      end
+
+      # over write the object management implementation as
+      # the edge should never have objects
+      def add(*args)
+        raise 'Attempt to add object off the edge of the map'
+      end
     end
   end
 end

lib/render/console.rb

@@ -1,11 +1,13 @@
 require 'lib/render/console/draw_map'
 require 'lib/render/console/draw_tile'
 require 'lib/render/console/draw_message'
+require 'lib/render/console/player_inventry'
 
 module Render
   class Console
     include Render::Console::DrawMap
     include Render::Console::DrawMessage
+    include Render::Console::PlayerInventry
 
     def initialize(io=STDOUT)
       @io = io