Add MAP command to explicitely set map size.

[plomrogue2-experiments] / new2 / plomrogue / commands.py

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index df347289f64459ce4718df6aefb6a87a6ec920d2..2ca62304e38160c5d466ba8ff76b05da7ba097af 100644 (file)
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -13,11 +13,17 @@ cmd_ALL.argtypes = 'string'
 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')
-    t = game.thing_types['player'](game)
+    if connection_id in game.sessions:
+        t_id = game.sessions[connection_id]
+        t = game.get_thing(t_id, False)
+        game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id)
+    else:
+        t = game.thing_types['player'](game)
+        game.things += [t]  # TODO refactor into Thing.__init__?
+        game.sessions[connection_id] = t.id_
+        game.io.send('META ' + quote('you are now: ' + nick), connection_id)
     t.nickname = nick
-    game.things += [t]  # TODO refactor into Thing.__init__?
-    game.sessions[connection_id] = t.id_ 
-    game.io.send('META ' + quote('you are now: ' + nick), connection_id)
+    game.io.send('PLAYER_ID %s' % t.id_, connection_id)
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_QUERY(game, target_nick, msg, connection_id):
@@ -39,17 +45,6 @@ def cmd_PING(game, connection_id):
     game.io.send('PONG')
 cmd_PING.argtypes = ''
 
-def cmd_SAVE(game):
-
-    def write(f, msg):
-        f.write(msg + '\n')
-
-    with open(game.io.save_file, 'w') as f:
-        write(f, 'TURN %s' % game.turn)
-        for y, line in game.map.lines():
-            write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
-cmd_SAVE.argtypes = ''
-
 def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
@@ -57,3 +52,7 @@ cmd_TURN.argtypes = 'int:nonneg'
 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_map(size)
+cmd_MAP.argtypes = 'yx_tuple:pos'