X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=e62d6639468d0e5606bd0bec4cbfcf77cc396a37;hb=957e53c2d64cbb227f5bfe34653c766381659f01;hp=3e8a476460687b873192d1cc0f54f03215b358e9;hpb=27c9f26f715fd388087beea4b2cfb7eb495b1cc3;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 3e8a476..e62d663 100644
--- 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,14 +14,27 @@ 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)
-        d = math.sqrt(d_y ** 2 + d_x ** 2)
-        distance = '(close)' if d < 3 else '(distant)'
+        volume = 1 / max(1, dijkstra_map[listener.position])
         game.io.send('CHAT ' +
-                     quote('%s %s: %s' % (distance, speaker.nickname, msg)),
+                     quote('(volume: %.3f) %s: %s' % (volume, speaker.nickname, msg)),
                      c_id)
 cmd_ALL.argtypes = 'string'
 
@@ -82,6 +95,9 @@ def cmd_TURN(game, n):
 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] != '.':
+        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')
     if msg == ' ':
@@ -93,6 +109,9 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
 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] != '.':
+        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')
     if msg == ' ':
@@ -114,9 +133,12 @@ def cmd_GOD_PORTAL(game, yx, msg):
 cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
-    annotation = '(none)';
-    if yx in game.annotations:
-        annotation = game.annotations[yx]
+    player = game.get_thing(game.sessions[connection_id], False)
+    annotation = '(unknown)';
+    if player.fov_stencil[yx] == '.':
+        annotation = '(none)';
+        if yx in game.annotations:
+            annotation = game.annotations[yx]
     game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
 cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'