X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=a80731da48336af7db5dbd9359a00ad56a4ad05f;hb=HEAD;hp=97001e0a313f294854eeed5165944418ad1e44e6;hpb=1d9e41e7df05336a6688382c9374c547979cf11e;p=plomrogue2-experiments

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 97001e0..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):
@@ -69,6 +69,15 @@ def cmd_ANNOTATE(game, yx, msg, connection_id):
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
 
+def cmd_PORTAL(game, yx, msg, connection_id):
+    if msg == ' ':
+        if yx in game.portals:
+            del game.portals[yx]
+    else:
+        game.portals[yx] = msg
+    game.changed = True
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
     if yx in game.annotations:
@@ -80,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'