Remove chat QUERY.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index ccc09c0c8f945a92d1fee3d16f375c93882d6980..8ec6f524d22e8283ba13fc47424dc4e18352de2d 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
 
 
 
@@ -10,26 +10,59 @@ def cmd_TASKS(game, connection_id):
 cmd_TASKS.argtypes = ''
 
 def cmd_ALL(game, msg, connection_id):
-    import math
+
+    def lower_msg_by_volume(msg, volume):
+        lowered_msg = ''
+        for c in msg:
+            c = c
+            while random.random() > volume * 8:
+                if c.isupper():
+                    c = c.lower()
+                elif c != '.' and c != ' ':
+                    c = '.'
+                else:
+                    c = ' '
+            lowered_msg += c
+        return lowered_msg
+
+    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], False)
+    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))
     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)
+        listener_vol = dijkstra_map[game.map.get_position_index(listener.position)]
+        volume = 1 / max(1, listener_vol)
+        lowered_msg = lower_msg_by_volume(msg, volume)
+        lowered_nick = lower_msg_by_volume(speaker.nickname, volume)
         game.io.send('CHAT ' +
-                     quote('(volume: %.3f) %s: %s' % (volume, speaker.nickname, msg)),
+                     quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
+                                                      lowered_msg)),
                      c_id)
 cmd_ALL.argtypes = 'string'
 
@@ -66,20 +99,20 @@ def cmd_GET_GAMESTATE(game, connection_id):
     game.send_gamestate(connection_id)
 cmd_GET_GAMESTATE.argtypes = ''
 
-def cmd_QUERY(game, target_nick, msg, connection_id):
-    if not connection_id in game.sessions:
-        raise GameError('can only query when logged in')
-    t = game.get_thing(game.sessions[connection_id], False)
-    source_nick = t.nickname
-    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
-        for c_id in game.sessions:
-            if game.sessions[c_id] == t.id_:
-                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
-                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
-                return
-        raise GameError('target user offline')
-    raise GameError('can only query with registered nicknames')
-cmd_QUERY.argtypes = 'string string'
+#def cmd_QUERY(game, target_nick, msg, connection_id):
+#    if not connection_id in game.sessions:
+#        raise GameError('can only query when logged in')
+#    t = game.get_thing(game.sessions[connection_id], False)
+#    source_nick = t.nickname
+#    for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
+#        for c_id in game.sessions:
+#            if game.sessions[c_id] == t.id_:
+#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+#                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+#                return
+#        raise GameError('target user offline')
+#    raise GameError('can only query with registered nicknames')
+#cmd_QUERY.argtypes = 'string string'
 
 def cmd_PING(game, connection_id):
     game.io.send('PONG', connection_id)
@@ -91,7 +124,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 +138,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')