Re-write mapping system to accomodate infinite map growth.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index dfb536c27f8e6f9acb49b8e5ad2d60d16c66e27e..cedee68266583f9486dea676a0d67bd5bacb2378 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -6,7 +6,7 @@ from plomrogue.mapping import YX
 class ThingBase:
     type_ = '?'
 
-    def __init__(self, game, id_=0, position=(YX(0,0))):
+    def __init__(self, game, id_=0, position=(YX(0,0),YX(0,0))):
         self.game = game
         if id_ == 0:
             self.id_ = self.game.new_thing_id()
@@ -94,21 +94,24 @@ class ThingAnimate(Thing):
         if self._fov:
             return self._fov
         fov_map_class = self.game.map_geometry.fov_map_class
-        self._fov = fov_map_class(self.game.map, self.position, 12)
+        self._fov = fov_map_class(self.game.maps, self.position, 12,
+                                  self.game.get_map)
         return self._fov
 
-    def fov_test(self, yx):
-        test_position = self.fov_stencil.target_yx(yx)
+    def fov_test(self, big_yx, little_yx):
+        test_position = self.fov_stencil.target_yx(big_yx, little_yx)
         if self.fov_stencil.inside(test_position):
             if self.fov_stencil[test_position] == '.':
                 return True
         return False
 
-    def fov_stencil_map(self, map):
+    def fov_stencil_map(self, map_type='normal'):
         visible_terrain = ''
         for yx in self.fov_stencil:
             if self.fov_stencil[yx] == '.':
-                visible_terrain += map[self.fov_stencil.source_yx(yx)]
+                big_yx, little_yx = self.fov_stencil.source_yxyx(yx)
+                map_ = self.game.get_map(big_yx, map_type)
+                visible_terrain += map_[little_yx]
             else:
                 visible_terrain += ' '
         return visible_terrain