rename location to tile

lib/game.rb

@@ -6,7 +6,7 @@
 require 'lib/game/input'
 require 'lib/game/player'
 require 'lib/game/map'
-require 'lib/game/location'
+require 'lib/game/tile'
 require 'lib/game/object'
 
 require 'json'

lib/game/map.rb

@@ -34,18 +34,18 @@ def method_missing(method, *args, &blk)
       super
     end
 
-    def start_location
+    def start_tile
       at(0, 0)
     end
 
     private
     def build_data
-      Game::Location.clear
+      Game::Tile.clear
       map = []
       @map_data['data'].each_with_index do |row, x|
         row_items = []
-        row.each_with_index do |location, y|
-          row_items << Game::Location.build(location, x, y)
+        row.each_with_index do |tile, y|
+          row_items << Game::Tile.build(tile, x, y)
         end
         map << row_items
       end

lib/game/modules/object_management.rb

@@ -2,7 +2,7 @@ class Game
   module Modules
     module ObjectManagement
       def add(object)
-        object.location = self
+        object.tile = self
         @objects << object
       end
 

lib/game/object.rb

@@ -5,7 +5,7 @@
 require 'lib/game/object/exit'
 require 'lib/game/object/healer'
 require 'lib/game/object/inventry_item'
-require 'lib/game/object/location_modifier'
+require 'lib/game/object/tile_modifier'
 require 'lib/game/object/passage'
 require 'lib/game/object/switcher'
 require 'lib/game/object/setter'

lib/game/object/default.rb

@@ -2,7 +2,7 @@ class Game
   class Object
     module Default
       def self.included(base)
-        base.send :attr_accessor, :location
+        base.send :attr_accessor, :tile
       end
 
       def initialize(options)

lib/game/object/exit.rb

@@ -4,7 +4,7 @@ module Exit
       def auto_process
         if @options['next_map']
           skip_to next_map
-          move_to if @options["exit_location"]
+          move_to if @options["exit_tile"]
         else
           Game::Engine.instance.end('Congratulations you have Won.')
         end
@@ -21,7 +21,7 @@ def skip_to(name)
       end
 
       def move_to
-        Game::Player.instance.move_to(Game::Location.at(*exit_location))
+        Game::Player.instance.move_to(Game::Tile.at(*exit_tile))
       end
       private :move_to
     end

lib/game/object/healer.rb

@@ -3,7 +3,7 @@ class Object
     module Healer
       def auto_process
         self.health -= Game::Player.instance.heal(health)
-        self.location.remove(self) if self.health == 0
+        self.tile.remove(self) if self.health == 0
       end
 
       def health

lib/game/object/tile_modifier.rb

@@ -0,0 +1,9 @@
+class Game
+  class Object
+    module TileModifier
+      def end_point
+        @options['end_point'] || raise('No end point set for tile modifier')
+      end
+    end
+  end
+end

lib/game/player.rb

@@ -8,7 +8,7 @@ class Player
     include Game::Player::Movements
     include Game::Modules::InstanceSetter
 
-    attr_accessor :location
+    attr_accessor :tile
     attr_reader :objects
     attr_reader :hp
 

lib/game/player/actions.rb

@@ -3,7 +3,7 @@ class Player
     module Actions
       def take_action
         objects_to_pick_up.each do |obj|
-          location.remove(obj)
+          tile.remove(obj)
           add(obj)
         end
         objects_to_responding_to(:process).each do |obj|
@@ -18,12 +18,12 @@ def take_auto_action
       end
 
       def objects_to_pick_up
-        location.objects.select {|obj| obj.is_a?(Game::Object::InventryItem) }
+        tile.objects.select {|obj| obj.is_a?(Game::Object::InventryItem) }
       end
       private :objects_to_pick_up
 
       def objects_to_responding_to(method)
-        location.objects.select {|obj| obj.respond_to?(method) }
+        tile.objects.select {|obj| obj.respond_to?(method) }
       end
       private :objects_to_responding_to
     end

lib/game/player/movements.rb

@@ -7,26 +7,26 @@ def self.included(base)
 
       def load_map(map)
         @map = map
-        @location = @map.start_location
-        @location.add(self)
+        @tile = @map.start_tile
+        @tile.add(self)
       end
 
       def move(direction)
         @direction = direction
-        new_location = @location.at(direction)
-        if new_location.passible?(objects)
-          move_to new_location
+        new_tile = @tile.at(direction)
+        if new_tile.passible?(objects)
+          move_to new_tile
           take_auto_action
         else
           # beep or something here
           print "\a"
         end
       end
 
-      def move_to(location)
-        @location.remove(self)
-        @location = location
-        @location.add(self)
+      def move_to(tile)
+        @tile.remove(self)
+        @tile = tile
+        @tile.add(self)
       end
     end
   end

lib/game/location.rb → lib/game/tile.rb

@@ -1,13 +1,13 @@
-require 'lib/game/location/modules'
-require 'lib/game/location/movement'
-require 'lib/game/location/passible'
+require 'lib/game/tile/modules'
+require 'lib/game/tile/movement'
+require 'lib/game/tile/passible'
 
-require 'lib/game/location/edge'
-require 'lib/game/location/empty'
-require 'lib/game/location/wall'
+require 'lib/game/tile/edge'
+require 'lib/game/tile/empty'
+require 'lib/game/tile/wall'
 
 class Game
-  class Location
+  class Tile
     EMPTY_CELL = 0
     WALL_90 = 1
     WALL_CORNER_LEFT = 4
@@ -16,13 +16,13 @@ class Location
     WALL_0 = 3
 
     class << self
-      def build(location_type, x, y)
+      def build(tile_type, x, y)
         @board ||= {}
-        @board[[x, y]] = class_for(location_type).new(location_type, x, y)
+        @board[[x, y]] = class_for(tile_type).new(tile_type, x, y)
       end
 
-      def class_for(location_type)
-        case location_type
+      def class_for(tile_type)
+        case tile_type
         when WALL_0, WALL_90, WALL_CORNER_RIGHT,
              WALL_CORNER_LEFT, WALL_CORNER
           Wall

lib/game/location/edge.rb → lib/game/tile/edge.rb

@@ -1,8 +1,8 @@
 class Game
-  class Location
+  class Tile
     class Edge
-      include Game::Location::Base
-      include Game::Location::Impassible
+      include Game::Tile::Base
+      include Game::Tile::Impassible
 
       def self.instance
         @self ||= new

lib/game/tile/empty.rb

@@ -0,0 +1,11 @@
+class Game
+  class Tile
+    class Empty
+      include Game::Modules::ObjectManagement
+      include Game::Tile::Base
+      include Game::Tile::Passible
+      include Game::Tile::Movement
+
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 class Game
-  class Location
+  class Tile
     module Impassible
       def passible?(player_objects)
         false
@@ -14,19 +14,19 @@ def passible?(player_objects)
 
     module Base
       def self.included(base)
-        base.send :attr_accessor, :location_type
+        base.send :attr_accessor, :tile_type
         base.send :attr_reader, :objects, :x, :y
       end
 
-      def initialize(location_type, x, y)
-        @location_type = location_type
+      def initialize(tile_type, x, y)
+        @tile_type = tile_type
         @x = x
         @y = y
         @objects = []
       end
 
       def ==(val)
-        location_type == val.location_type &&
+        tile_type == val.tile_type &&
         x == val.x &&
         y == val.y
       end

lib/game/tile/movement.rb

@@ -0,0 +1,23 @@
+class Game
+  class Tile
+    module Movement
+      def at(direction)
+        tile = Game::Tile.at(@x - 1, @y) if direction == :up
+        tile = Game::Tile.at(@x + 1, @y) if direction == :down
+        tile = Game::Tile.at(@x, @y - 1) if direction == :left
+        tile = Game::Tile.at(@x, @y + 1) if direction == :right
+
+        tile.try(:end_point) || Game::Tile::Edge.instance
+      end
+
+      def end_point
+        if has_object?(Game::Object::TileModifier)
+          Game::Tile.at(*get_object(Game::Object::TileModifier).end_point)
+        else
+          self
+        end
+      end
+      private :end_point
+    end
+  end
+end

lib/game/location/passible.rb → lib/game/tile/passible.rb

@@ -1,5 +1,5 @@
 class Game
-  class Location
+  class Tile
     module Passible
       def passible?(player_objects)
         objects.all?(&:passible?)

lib/game/location/wall.rb → lib/game/tile/wall.rb

@@ -1,9 +1,9 @@
 class Game
-  class Location
+  class Tile
     class Wall
       include Game::Modules::ObjectManagement
-      include Game::Location::Base
-      include Game::Location::Movement
+      include Game::Tile::Base
+      include Game::Tile::Movement
 
       def passible?(player_objects)
         return false unless has_object?(Game::Object::Passage)

lib/render/console/draw_map.rb

@@ -8,7 +8,7 @@ def draw_map(engine)
         draw_board(engine.map.data)
         draw_stats(engine.player)
         draw_player(engine.player)
-        draw_tile(engine.player.location)
+        draw_tile(engine.player.tile)
 
         system('clear')
         @io.puts @output
@@ -66,7 +66,7 @@ def draw_player(player)
 
       def draw_tile(tile)
         objects = tile.objects.dup
-        append "Location: "
+        append "Tile: "
         append "  ", tile.class
         append "Items: "
         objects.each do |obj|