Shrink sound Dijkstra map, reach; refactor lots of mapping code.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index da5cf7771c5698c0ce5c487737dc1ea26902362c..dfb536c27f8e6f9acb49b8e5ad2d60d16c66e27e 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -94,11 +94,11 @@ 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)
+        self._fov = fov_map_class(self.game.map, self.position, 12)
         return self._fov
 
     def fov_test(self, yx):
-        test_position = yx - self.fov_stencil.offset
+        test_position = self.fov_stencil.target_yx(yx)
         if self.fov_stencil.inside(test_position):
             if self.fov_stencil[test_position] == '.':
                 return True
@@ -108,8 +108,7 @@ class ThingAnimate(Thing):
         visible_terrain = ''
         for yx in self.fov_stencil:
             if self.fov_stencil[yx] == '.':
-                corrected_yx = yx + self.fov_stencil.offset
-                visible_terrain += map[corrected_yx]
+                visible_terrain += map[self.fov_stencil.source_yx(yx)]
             else:
                 visible_terrain += ' '
         return visible_terrain