X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=a92359eac8c2fcab197ea9ea42d2cd2de72b9a40;hb=a0937c1f3712d61831911075c7dacedcb616a261;hp=6532b72bbe027ebb65d0805025140a49da8145d4;hpb=9316d59ddce7a7b8ee70d2b4e111330f1a691e37;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index 6532b72..a92359e 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -44,7 +44,8 @@ def cmd_ALL(game, msg, connection_id): if not speaker: raise GameError('need to be logged in for this') largest_audible_distance = 20 - dijkstra_map = DijkstraMap(game.maps, speaker.position, + things = [t for t in game.things if t.type_ != 'Player'] + dijkstra_map = DijkstraMap(things, game.maps, speaker.position, largest_audible_distance, game.get_map) for c_id in game.sessions: listener = game.get_player(c_id) @@ -79,7 +80,7 @@ def cmd_LOGIN(game, nick, connection_id): t = game.thing_types['Player'](game) t.position = game.spawn_point game.things += [t] # TODO refactor into Thing.__init__? - t.player_char = game.get_next_player_char() + t.thing_char = game.get_next_player_char() game.sessions[connection_id] = { 'thing_id': t.id_, 'status': 'player' @@ -310,3 +311,14 @@ def cmd_GOD_THING_PROTECTION(game, thing_id, protection_char): raise GameError('thing of ID %s not found' % thing_id) t.protection = protection_char cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char' + +def cmd_THING_DOOR_CLOSED(game, thing_id): + t = game.get_thing(thing_id) + if not t: + raise GameError('thing of ID %s not found' % thing_id) + if not t.type_ == 'Door': + raise GameError('thing of ID %s not door' % thing_id) + t.blocking = True + t.portable = False + t.thing_char = '#' +cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'