X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=3e8a476460687b873192d1cc0f54f03215b358e9;hb=27c9f26f715fd388087beea4b2cfb7eb495b1cc3;hp=85ec5d31b2d4c3c40ae1bf0ee0a3f9e877e00167;hpb=46108644f062458df5b0540f806abffab650683f;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 85ec5d3..3e8a476 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -10,10 +10,19 @@ 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)
+        d = math.sqrt(d_y ** 2 + d_x ** 2)
+        distance = '(close)' if d < 3 else '(distant)'
+        game.io.send('CHAT ' +
+                     quote('%s %s: %s' % (distance, speaker.nickname, msg)),
+                     c_id)
 cmd_ALL.argtypes = 'string'
 
 def cmd_LOGIN(game, nick, connection_id):
@@ -72,8 +81,8 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
-def cmd_ANNOTATE(game, yx, msg, pw=None, connection_id=None):
-    if connection_id and not game.can_do_tile_with_pw(yx, pw):
+def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
         if yx in game.annotations:
@@ -83,8 +92,8 @@ def cmd_ANNOTATE(game, yx, msg, pw=None, connection_id=None):
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
-def cmd_PORTAL(game, yx, msg, pw=None, connection_id=None):
-    if connection_id and not game.can_do_tile_with_pw(yx, pw):
+def cmd_PORTAL(game, yx, msg, pw, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
         raise GameError('wrong password for tile')
     if msg == ' ':
         if yx in game.portals:
@@ -94,6 +103,16 @@ def cmd_PORTAL(game, yx, msg, pw=None, connection_id=None):
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
+def cmd_GOD_ANNOTATE(game, yx, msg):
+    game.annotations[yx] = msg
+    game.changed = True
+cmd_GOD_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+
+def cmd_GOD_PORTAL(game, yx, msg):
+    game.portals[yx] = msg
+    game.changed = True
+cmd_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string'
+
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
     if yx in game.annotations: