X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=bdf4824dcfa7325d6e8ef398ae78f04c91c035f7;hb=1fcb132eabcaa1a95bf2b527dc18c92c15016d2a;hp=96c5d226dedd400d2c14717d3207e004dae90432;hpb=22726901655f3a91124734e11c385a654845e99d;p=plomrogue2-experiments

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 96c5d22..bdf4824 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
 
 
 
@@ -11,6 +11,7 @@ def cmd_ALL(game, msg, connection_id):
     game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
 cmd_ALL.argtypes = 'string'
 
+# TOOD split into two commands
 def cmd_LOGIN(game, nick, connection_id):
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]:
         raise GameError('name already in use')
@@ -25,7 +26,7 @@ def cmd_LOGIN(game, nick, connection_id):
         t.position = YX(game.map.size.y // 2, game.map.size.x // 2)
         game.things += [t]  # TODO refactor into Thing.__init__?
         game.sessions[connection_id] = t.id_
-        game.io.send('LOGIN_OK')
+        game.io.send('LOGIN_OK', connection_id)
         t.nickname = nick
         game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
         game.io.send('PLAYER_ID %s' % t.id_, connection_id)
@@ -68,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:
@@ -79,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'