X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=inline;f=plomrogue%2Fcommands.py;h=0c3da0ada3b9e49dc784dbd9000c674f0a86b142;hb=3efcac66212325fecbbf28e3c19762821fb65d76;hp=a4507b1b74f011654b62de6f319df45fdf963c57;hpb=efb443c755706f750e3ff76e719ee162150f6e43;p=plomrogue2 diff --git a/plomrogue/commands.py b/plomrogue/commands.py index a4507b1..0c3da0a 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -1,13 +1,11 @@ from plomrogue.misc import quote from plomrogue.errors import GameError -from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex, DijkstraMap # TODO: instead of sending tasks, thing types etc. on request, send them on connection def cmd_TASKS(game, connection_id): - tasks = [] game.io.send('TASKS ' + ','.join(game.tasks.keys()), connection_id) cmd_TASKS.argtypes = '' @@ -24,6 +22,7 @@ def cmd_TERRAINS(game, connection_id): cmd_TERRAINS.argtypes = '' def cmd_ALL(game, msg, connection_id): + from plomrogue.mapping import DijkstraMap def lower_msg_by_volume(msg, volume, largest_audible_distance): import random @@ -198,7 +197,7 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id): if msg == ' ': if big_yx in game.portals: if little_yx in game.portals[big_yx]: - del game.portals[big_yx][little_xy] + del game.portals[big_yx][little_yx] else: if not big_yx in game.portals: game.portals[big_yx] = {} @@ -254,7 +253,7 @@ cmd_MAP_CONTROL_PW.argtypes = 'char string' def cmd_THING(game, big_yx, little_yx, thing_type, thing_id): if not thing_type in game.thing_types: raise GameError('illegal thing type %s' % thing_type) - map_ = game.get_map(big_yx) + _ = game.get_map(big_yx) t_old = None if thing_id > 0: t_old = game.get_thing(thing_id)