X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_structured?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=8ec6f524d22e8283ba13fc47424dc4e18352de2d;hb=e67306357a830cabdd5ce86b2b333499d99da325;hp=9c0111c46dcd394bd9e7e9b7baf285f523f93734;hpb=cf8ab4843ff083bd174a30a5bb148ed3a9c531e2;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 9c0111c..8ec6f52 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -15,10 +15,10 @@ def cmd_ALL(game, msg, connection_id):
         lowered_msg = ''
         for c in msg:
             c = c
-            while random.random() > volume * 4:
+            while random.random() > volume * 8:
                 if c.isupper():
                     c = c.lower()
-                elif c != '.':
+                elif c != '.' and c != ' ':
                     c = '.'
                 else:
                     c = ' '
@@ -29,25 +29,35 @@ 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
+    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 pos in dijkstra_map:
-            if game.map[pos] == 'X':
+        for i in range(map_size):
+            if game.map.terrain[i] == 'X':
                 continue
-            neighbors = game.map_geometry.get_neighbors(pos)
+            neighbors = game.map_geometry.get_neighbors_i(i)
             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
+                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)
-        volume = 1 / max(1, dijkstra_map[listener.position])
+        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 ' +
@@ -89,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)