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

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 7eaa28bb2e5339015de1ac4ce6d049756a1f26a1..0a33a56ef2e5bbd1426084fec67d4cb38351c9ff 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -113,21 +113,21 @@ class Game(GameBase):
             visible_terrain = player.fov_stencil_map(self.map)
             self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
             self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
-                                           self.map_geometry.size,
+                                           player.fov_stencil.size,
                                            quote(visible_terrain)), c_id)
             visible_control = player.fov_stencil_map(self.map_control)
             self.io.send('MAP_CONTROL %s' % quote(visible_control), c_id)
-            for t in [t for t in self.things
-                      if player.fov_stencil[t.position] == '.']:
-                self.io.send('THING %s %s %s' % (t.position, t.type_, t.id_), c_id)
+            for t in [t for t in self.things if player.fov_test(t.position)]:
+                target_yx = player.fov_stencil.target_yx(t.position)
+                self.io.send('THING %s %s %s' % (target_yx, t.type_, t.id_), c_id)
                 if hasattr(t, 'name'):
                     self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
                 if hasattr(t, 'player_char'):
                     self.io.send('THING_CHAR %s %s' % (t.id_,
                                                        quote(t.player_char)), c_id)
-            for yx in [yx for yx in self.portals
-                       if player.fov_stencil[yx] == '.']:
-                self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx])), c_id)
+            for yx in [yx for yx in self.portals if player.fov_test(yx)]:
+                self.io.send('PORTAL %s %s' % (player.fov_stencil.target_yx(yx),
+                                               quote(self.portals[yx])), c_id)
         self.io.send('GAME_STATE_COMPLETE')
 
     def run_tick(self):