From: Christian Heller Date: Fri, 20 Nov 2020 00:32:38 +0000 (+0100) Subject: Add some safeguards against stupid map protection decisions. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/bar%20baz.html?a=commitdiff_plain;h=ba3c64445489ef0194b5e5025f87dd3c557d827a;p=plomrogue2 Add some safeguards against stupid map protection decisions. --- diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 1df56bc..843bcfe 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -106,6 +106,8 @@ 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 @@ -118,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'