Improve volume logic, display.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 389b534da2bb7783dbd254a5ba16eb19f94289c0..ccc09c0c8f945a92d1fee3d16f375c93882d6980 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -10,10 +10,27 @@ def cmd_TASKS(game, connection_id):
 cmd_TASKS.argtypes = ''
 
 def cmd_ALL(game, msg, connection_id):
+    import math
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
-    t = game.get_thing(game.sessions[connection_id], False)
-    game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
+    speaker = game.get_thing(game.sessions[connection_id], False)
+    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)
+        game.io.send('CHAT ' +
+                     quote('(volume: %.3f) %s: %s' % (volume, speaker.nickname, msg)),
+                     c_id)
 cmd_ALL.argtypes = 'string'
 
 def cmd_LOGIN(game, nick, connection_id):
@@ -73,6 +90,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 == ' ':
@@ -84,6 +104,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 == ' ':
@@ -105,9 +128,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'