Fix visibility tests on annotation, volume algorithm.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index ccc09c0c8f945a92d1fee3d16f375c93882d6980..e62d6639468d0e5606bd0bec4cbfcf77cc396a37 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,6 +1,6 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError
-from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
+from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, Map
 
 
 
@@ -14,20 +14,25 @@ def cmd_ALL(game, msg, connection_id):
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
     speaker = game.get_thing(game.sessions[connection_id], False)
+    dijkstra_map = Map(game.map_geometry.size)
+    n_max = 256
+    dijkstra_map.terrain = [n_max for i in range(dijkstra_map.size_i)]
+    dijkstra_map[speaker.position] = 0
+    shrunk = True
+    while shrunk:
+        shrunk = False
+        for pos in dijkstra_map:
+            if game.map[pos] == 'X':
+                continue
+            neighbors = game.map_geometry.get_neighbors(pos)
+            for direction in [d for d in neighbors if neighbors[d]]:
+                yx = neighbors[direction]
+                if dijkstra_map[yx] < dijkstra_map[pos] - 1:
+                    dijkstra_map[pos] = dijkstra_map[yx] + 1
+                    shrunk = True
     for c_id in game.sessions:
         listener = game.get_thing(game.sessions[c_id], create_unfound=False)
-        d_y = abs(speaker.position.y - listener.position.y)
-        d_x = abs(speaker.position.x - listener.position.x)
-        distance = math.sqrt(d_y ** 2 + d_x ** 2)
-        fov_overlap = 1
-        if listener.fov_stencil[speaker.position] != '.':
-            fov_overlap_tiles = 0
-            for i in range(speaker.fov_stencil.size_i):
-                if speaker.fov_stencil.terrain[i] == '.' and\
-                   listener.fov_stencil.terrain[i] == '.':
-                    fov_overlap_tiles += 1
-            fov_overlap = fov_overlap_tiles / speaker.fov_stencil.size_i
-        volume = fov_overlap / max(1, distance)
+        volume = 1 / max(1, dijkstra_map[listener.position])
         game.io.send('CHAT ' +
                      quote('(volume: %.3f) %s: %s' % (volume, speaker.nickname, msg)),
                      c_id)
@@ -91,7 +96,7 @@ cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
     player = game.get_thing(game.sessions[connection_id], False)
-    if player.fov_stencil[yx] == '.':
+    if player.fov_stencil[yx] != '.':
         raise GameError('cannot annotate tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
@@ -105,7 +110,7 @@ cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
 def cmd_PORTAL(game, yx, msg, pw, connection_id):
     player = game.get_thing(game.sessions[connection_id], False)
-    if player.fov_stencil[yx] == '.':
+    if player.fov_stencil[yx] != '.':
         raise GameError('cannot edit portal on tile outside field of view')
     if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')