move life force processing out of player class

lib/game/modules/object_management.rb

@@ -1,6 +1,15 @@
 class Game
   module Modules
     module ObjectManagement
+      def self.included(base)
+        base.send :attr_reader, :objects
+      end
+
+      def initialize(*args)
+        super
+        @objects = []
+      end
+
       def add(object)
         if self.is_a?(Game::Player)
           object.player = self if object.respond_to?(:player)

lib/game/modules/try_helper.rb

@@ -2,8 +2,7 @@ class Game
   module Modules
     module TryHelper
       def try(method, *args, &block)
-        return nil if self.nil?
-        send(method, *args, &block)
+        self && send(method, *args, &block)
       end
     end
   end

lib/game/player.rb

@@ -1,38 +1,17 @@
 require 'lib/game/player/actions'
+require 'lib/game/player/life_force'
 require 'lib/game/player/movements'
 
 class Game
   class Player
     include Game::Modules::ObjectManagement
     include Game::Player::Actions
     include Game::Player::Movements
+    include Game::Player::LifeForce
     include Game::Modules::InstanceSetter
 
     attr_accessor :tile
-    attr_reader :objects
     attr_reader :hp
 
-    def initialize(*args)
-      super(*args)
-      @objects = []
-      @hp = 100
-    end
-
-    def damage(hp)
-      if hp >= @hp
-        @hp = 0
-        Game::Engine.instance.end('Unfortunately you died.')
-      else
-        @hp -= hp
-      end
-    end
-
-    def heal(hp)
-      @hp += hp
-      return hp if @hp <= 100
-      used = hp - (@hp - 100)
-      @hp = 100
-      used
-    end
   end
 end

lib/game/player/life_force.rb

@@ -0,0 +1,32 @@
+class Game
+  class Player
+    module LifeForce
+
+      def self.included(base)
+        base.send :attr_reader, :hp
+      end
+
+      def initialize(*args)
+        super
+        @hp = 100
+      end
+
+      def damage(hp)
+        if hp >= @hp
+          @hp = 0
+          Game::Engine.instance.end('Unfortunately you died.')
+        else
+          @hp -= hp
+        end
+      end
+
+      def heal(hp)
+        @hp += hp
+        return hp if @hp <= 100
+        used = hp - (@hp - 100)
+        @hp = 100
+        used
+      end
+    end
+  end
+end

lib/game/player/movements.rb

@@ -6,7 +6,7 @@ def self.included(base)
       end
 
       def initialize(*args)
-        super(*args)
+        super
         @direction = Game::Map::NORTH
       end
 

lib/game/tile/modules.rb

@@ -0,0 +1,24 @@
+class Game
+  class Tile
+    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
+        @objects = []
+      end
+
+      def ==(val)
+        tile_type == val.tile_type &&
+        x == val.x &&
+        y == val.y
+      end
+    end
+  end
+end