X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=12389c653d9584da3f4260bf4f59dbb92ed19f85;hb=d5f31d8172456933650aee47f8fe730d98839181;hp=f8c8e3aa5aa139d3ece7746abe37162ed7ad58f9;hpb=ff01e1b466c1df7c938d1281ca34718e555bcf67;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index f8c8e3a..12389c6 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -72,23 +72,37 @@ 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_PORTAL.argtypes = 'yx_tuple:nonneg string' +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_GOD_PORTAL.argtypes = 'yx_tuple:nonneg string' def cmd_GET_ANNOTATION(game, yx, connection_id): annotation = '(none)';