X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=843bcfe844ca509b5f3ee354f192e62df0affa91;hb=ba3c64445489ef0194b5e5025f87dd3c557d827a;hp=c0795991666f941cb85ecfe11d446b61d8dab9f8;hpb=750eb29e8a84e9846bb6b568745b8de453788f58;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index c079599..843bcfe 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -106,10 +106,13 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id): raise GameError('need to be logged in for this') if not game.sessions[connection_id]['status'] == 'admin': raise GameError('need to be admin for this') + if not control_char in game.map_control_passwords.keys(): + raise GameError('no password set for this tile class') big_yx, little_yx = player.fov_stencil.source_yxyx(yx) map_control = game.get_map(big_yx, 'control') map_control[little_yx] = control_char -cmd_SET_TILE_CONTROL.argtypes = 'yx:nonneg char' + game.changed = True +cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char' def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id): player = game.get_player(connection_id) @@ -117,6 +120,8 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id): raise GameError('need to be logged in for this') if not game.sessions[connection_id]['status'] == 'admin': raise GameError('need to be admin for this') + if tile_class == '.': + raise GameError('tile class "." must remain unprotected') game.map_control_passwords[tile_class] = password game.changed = True cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'