From: Christian Heller Date: Tue, 10 Nov 2020 10:47:59 +0000 (+0100) Subject: Use separate commands for god mode and non-god mode. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7Bdb.prefix%7D%7D/process?a=commitdiff_plain;h=3d9cd33d98bf022b5a30f9944d168ff4f9664329;p=plomrogue2 Use separate commands for god mode and non-god mode. --- diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 85ec5d3..fd08632 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -72,8 +72,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 +83,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 +94,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_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): annotation = '(none)'; if yx in game.annotations: