Shrink sound Dijkstra map, reach; refactor lots of mapping code.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index c52dd4fc706cd3600b67ffc9d4033b2be474b467..e40f5306585ad0541811fb89ff137be389672ff7 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, Map
+from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap
 
 
 
@@ -25,11 +25,13 @@ cmd_TERRAINS.argtypes = ''
 
 def cmd_ALL(game, msg, connection_id):
 
-    def lower_msg_by_volume(msg, volume):
+    def lower_msg_by_volume(msg, volume, largest_audible_distance):
+        import random
+        factor = largest_audible_distance / 8
         lowered_msg = ''
         for c in msg:
             c = c
-            while random.random() > volume * 8:
+            while random.random() > volume * factor:
                 if c.isupper():
                     c = c.lower()
                 elif c != '.' and c != ' ':
@@ -39,48 +41,25 @@ 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])
-    dijkstra_map = dijkstra(speaker)
+    largest_audible_distance = 20
+    dijkstra_map_class = game.map_geometry.dijkstra_map_class
+    dijkstra_map = dijkstra_map_class(game.map, speaker.position,
+                                      largest_audible_distance)
     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)]
-        volume = 1 / max(1, listener_vol)
-        lowered_msg = lower_msg_by_volume(msg, volume)
-        lowered_nick = lower_msg_by_volume(speaker.name, volume)
+        target_yx = dijkstra_map.target_yx(listener.position, True)
+        if not target_yx:
+            continue
+        listener_distance = dijkstra_map[target_yx]
+        if listener_distance > largest_audible_distance:
+            continue
+        volume = 1 / max(1, listener_distance)
+        lowered_msg = lower_msg_by_volume(msg, volume, largest_audible_distance)
+        lowered_nick = lower_msg_by_volume(speaker.name, volume,
+                                           largest_audible_distance)
         game.io.send('CHAT ' +
                      quote('(volume: %.2f) %s: %s' % (volume, lowered_nick,
                                                       lowered_msg)),
@@ -146,31 +125,31 @@ cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
     player = game.get_thing(game.sessions[connection_id])
-    corrected_yx = yx + player.fov_stencil.offset
-    if not player.fov_test(corrected_yx):
+    source_yx = player.fov_stencil.source_yx(yx)
+    if not player.fov_test(source_yx):
         raise GameError('cannot annotate tile outside field of view')
-    if not game.can_do_tile_with_pw(corrected_yx, pw):
+    if not game.can_do_tile_with_pw(source_yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
-        if corrected_yx in game.annotations:
-            del game.annotations[corrected_yx]
+        if source_yx in game.annotations:
+            del game.annotations[source_yx]
     else:
-        game.annotations[corrected_yx] = msg
+        game.annotations[source_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])
-    corrected_yx = yx + player.fov_stencil.offset
-    if not player.fov_test(corrected_yx):
+    source_yx = player.fov_stencil.source_yx(yx)
+    if not player.fov_test(source_yx):
         raise GameError('cannot edit portal on tile outside field of view')
-    if not game.can_do_tile_with_pw(corrected_yx, pw):
+    if not game.can_do_tile_with_pw(source_yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
-        if corrected_yx in game.portals:
-            del game.portals[corrected_yx]
+        if source_yx in game.portals:
+            del game.portals[source_yx]
     else:
-        game.portals[corrected_yx] = msg
+        game.portals[source_yx] = msg
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
@@ -186,12 +165,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
+    source_yx = player.fov_stencil.source_yx(yx)
     annotation = '(unknown)';
-    if player.fov_test(corrected_yx):
+    if player.fov_test(source_yx):
         annotation = '(none)';
-        if corrected_yx in game.annotations:
-            annotation = game.annotations[corrected_yx]
+        if source_yx in game.annotations:
+            annotation = game.annotations[source_yx]
     game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
 cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'