Shrink FOV map to radius.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 643988e63258a49480b185450a6d6632cfe86734..c52dd4fc706cd3600b67ffc9d4033b2be474b467 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -39,35 +39,42 @@ def cmd_ALL(game, msg, connection_id):
             lowered_msg += c
         return lowered_msg
 
+    def dijkstra(speaker):
+        n_max = 255
+
+        map_size = game.map.size_i
+        dijkstra_map = [n_max for i in range(game.map.size_i)]
+        dijkstra_map[game.map.get_position_index(speaker.position)] = 0
+
+        shrunk = True
+        while shrunk:
+            shrunk = False
+            for i in range(map_size):
+                if game.map.terrain[i] == 'X':
+                    continue
+                neighbors = game.map_geometry.get_neighbors_i(i)
+                for direction in [d for d in neighbors if neighbors[d]]:
+                    j = neighbors[direction]
+                    if dijkstra_map[j] < dijkstra_map[i] - 1:
+                        dijkstra_map[i] = dijkstra_map[j] + 1
+                        shrunk = True
+        #print('DEBUG')
+        #line_to_print = []
+        #x = 0
+        #for n in dijkstra_map:
+        #    line_to_print += ['%3s' % n]
+        #    x += 1
+        #    if x >= game.map.size.x:
+        #        x = 0
+        #        print(' '.join(line_to_print))
+        #        line_to_print = []
+        return dijkstra_map
+
     import random
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
     speaker = game.get_thing(game.sessions[connection_id])
-    n_max = 255
-    map_size = game.map.size_i
-    dijkstra_map = [n_max for i in range(game.map.size_i)]
-    dijkstra_map[game.map.get_position_index(speaker.position)] = 0
-    shrunk = True
-    while shrunk:
-        shrunk = False
-        for i in range(map_size):
-            if game.map.terrain[i] == 'X':
-                continue
-            neighbors = game.map_geometry.get_neighbors_i(i)
-            for direction in [d for d in neighbors if neighbors[d]]:
-                j = neighbors[direction]
-                if dijkstra_map[j] < dijkstra_map[i] - 1:
-                    dijkstra_map[i] = dijkstra_map[j] + 1
-                    shrunk = True
-    #print('DEBUG')
-    #line_to_print = []
-    #x = 0
-    #for n in dijkstra_map:
-    #    line_to_print += ['%3s' % n]
-    #    x += 1
-    #    if x >= game.map.size.x:
-    #        x = 0
-    #        print(' '.join(line_to_print))
+    dijkstra_map = dijkstra(speaker)
     for c_id in game.sessions:
         listener = game.get_thing(game.sessions[c_id])
         listener_vol = dijkstra_map[game.map.get_position_index(listener.position)]
@@ -139,29 +146,31 @@ cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
     player = game.get_thing(game.sessions[connection_id])
-    if player.fov_stencil[yx] != '.':
+    corrected_yx = yx + player.fov_stencil.offset
+    if not player.fov_test(corrected_yx):
         raise GameError('cannot annotate tile outside field of view')
-    if not game.can_do_tile_with_pw(yx, pw):
+    if not game.can_do_tile_with_pw(corrected_yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
-        if yx in game.annotations:
-            del game.annotations[yx]
+        if corrected_yx in game.annotations:
+            del game.annotations[corrected_yx]
     else:
-        game.annotations[yx] = msg
+        game.annotations[corrected_yx] = msg
     game.changed = True
 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])
-    if player.fov_stencil[yx] != '.':
+    corrected_yx = yx + player.fov_stencil.offset
+    if not player.fov_test(corrected_yx):
         raise GameError('cannot edit portal on tile outside field of view')
-    if not game.can_do_tile_with_pw(yx, pw):
+    if not game.can_do_tile_with_pw(corrected_yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
-        if yx in game.portals:
-            del game.portals[yx]
+        if corrected_yx in game.portals:
+            del game.portals[corrected_yx]
     else:
-        game.portals[yx] = msg
+        game.portals[corrected_yx] = msg
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
@@ -177,11 +186,12 @@ cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     player = game.get_thing(game.sessions[connection_id])
+    corrected_yx = yx + player.fov_stencil.offset
     annotation = '(unknown)';
-    if player.fov_stencil[yx] == '.':
+    if player.fov_test(corrected_yx):
         annotation = '(none)';
-        if yx in game.annotations:
-            annotation = game.annotations[yx]
+        if corrected_yx in game.annotations:
+            annotation = game.annotations[corrected_yx]
     game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
 cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'