X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=a80731da48336af7db5dbd9359a00ad56a4ad05f;hb=131e3c6e9a1808cef19a9085f060fe845a7b123d;hp=3741033be49af5ddaa44f803d072951186442243;hpb=9506b64fe6040ba2489d84ecf852c6e2ad7fef65;p=plomrogue2-experiments diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py index 3741033..a80731d 100644 --- a/new2/plomrogue/commands.py +++ b/new2/plomrogue/commands.py @@ -1,6 +1,6 @@ from plomrogue.misc import quote from plomrogue.errors import GameError -from plomrogue.mapping import YX +from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex @@ -53,7 +53,7 @@ def cmd_QUERY(game, target_nick, msg, connection_id): cmd_QUERY.argtypes = 'string string' def cmd_PING(game, connection_id): - game.io.send('PONG') + game.io.send('PONG', connection_id) cmd_PING.argtypes = '' def cmd_TURN(game, n): @@ -89,6 +89,7 @@ def cmd_MAP_LINE(game, y, line): game.map.set_line(y, line) cmd_MAP_LINE.argtypes = 'int:nonneg string' -def cmd_MAP(game, size): - game.new_world(size) -cmd_MAP.argtypes = 'yx_tuple:pos' +def cmd_MAP(game, geometry, size): + map_geometry_class = globals()['MapGeometry' + geometry] + game.new_world(map_geometry_class(size)) +cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'