X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=c51dcc9051d9d905f93a256f2dcd3db66cd3aff0;hb=b77d7b68103aa6c0d5787c4cb1d1d7b1874d9000;hp=e75cbe9001f495a0177d65ee0859d148486e897f;hpb=8c5624db0c2b463a490a425fc0f8baf2761d7d23;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index e75cbe9..c51dcc9 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -72,22 +72,36 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
-def cmd_ANNOTATE(game, yx, msg, connection_id):
+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:
             del game.annotations[yx]
     else:
         game.annotations[yx] = msg
     game.changed = True
-cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
-def cmd_PORTAL(game, yx, msg, connection_id):
+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:
             del game.portals[yx]
     else:
         game.portals[yx] = msg
     game.changed = True
+cmd_GOD_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_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
@@ -105,3 +119,11 @@ def cmd_MAP(game, geometry, size):
     map_geometry_class = globals()['MapGeometry' + geometry]
     game.new_world(map_geometry_class(size))
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
+
+def cmd_MAP_CONTROL_LINE(game, y, line):
+    game.map_control.set_line(y, line)
+cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string'
+
+def cmd_MAP_CONTROL_PW(game, tile_class, password):
+    game.map_control_passwords[tile_class] = password
+cmd_MAP_CONTROL_PW.argtypes = 'char string'