Allow annotations.

[plomrogue2-experiments] / new2 / plomrogue / commands.py

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 861aa64d8a65e5f231e3edccfe4dc9c9fd463a4f..9e67ce02600682eaa12823c3d63bf7c6ffaed6a8 100644 (file)
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -49,11 +49,28 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
+#def cmd_ANNOTATE(game, yx, connection_id):
+def cmd_ANNOTATE(game, yx, msg):
+    if msg == ' ':
+        if yx in game.annotations:
+            del game.annotations[yx]
+    else:
+        game.annotations[yx] = msg
+    game.changed = True
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+
+def cmd_GET_ANNOTATION(game, yx, connection_id):
+    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'
+
 # TODO: disallow these commands from clients? (maybe by failing on connection_id?)
 def cmd_MAP_LINE(game, y, line):
     game.map.set_line(y, line)
 cmd_MAP_LINE.argtypes = 'int:nonneg string'
 
 def cmd_MAP(game, size):
-    game.new_map(size)
+    game.new_world(size)
 cmd_MAP.argtypes = 'yx_tuple:pos'