X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=26576d052649b9b3f903650729ad760c79f6bf3c;hb=196af065fb3b232ab863303dc9d0b8acc1b062bb;hp=c0795991666f941cb85ecfe11d446b61d8dab9f8;hpb=750eb29e8a84e9846bb6b568745b8de453788f58;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index c079599..26576d0 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -44,7 +44,7 @@ def cmd_ALL(game, msg, connection_id): speaker = game.get_player(connection_id) if not speaker: raise GameError('need to be logged in for this') - largest_audible_distance = 20 + largest_audible_distance = 40 dijkstra_map = DijkstraMap(game.maps, speaker.position, largest_audible_distance, game.get_map) for c_id in game.sessions: @@ -65,14 +65,20 @@ def cmd_ALL(game, msg, connection_id): c_id) cmd_ALL.argtypes = 'string' +def cmd_SPAWN_POINT(game, big_yx, little_yx): + if little_yx.y >= game.map_geometry.size.y or \ + little_yx.x >= game.map_geometry.size.x: + raise GameError('illegal spawn point') + game.spawn_point = big_yx, little_yx +cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg' + def cmd_LOGIN(game, nick, connection_id): for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]: raise GameError('name already in use') if game.get_player(connection_id): raise GameError('cannot log in twice') t = game.thing_types['Player'](game) - t.position = (YX(0,0), - YX(game.map_geometry.size.y // 2, game.map_geometry.size.x // 2)) + t.position = game.spawn_point game.things += [t] # TODO refactor into Thing.__init__? t.player_char = game.get_next_player_char() game.sessions[connection_id] = { @@ -106,10 +112,14 @@ 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 == '.' + or 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 +127,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'