X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=new2%2Fplomrogue%2Fcommands.py;h=88a5211245c5d22661c6e8ae4460efd5abb44121;hb=dcb275a3ae06858ba25eee3c5cd7ab6c1d44a4df;hp=df347289f64459ce4718df6aefb6a87a6ec920d2;hpb=47d047c10bacf2463f48aec3e7f3cc3b92a78198;p=plomrogue2-experiments

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index df34728..88a5211 100644
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -1,5 +1,6 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError
+from plomrogue.mapping import YX
 
 
 
@@ -7,19 +8,30 @@ def cmd_ALL(game, msg, connection_id):
     if not connection_id in game.sessions:
         raise GameError('need to be logged in for this')
     t = game.get_thing(game.sessions[connection_id], False)
-    game.io.send('LOG ' + quote(t.nickname + ': ' + msg))
+    game.io.send('CHAT ' + quote(t.nickname + ': ' + msg))
 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)
+        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('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_GET_GAMESTATE(game, connection_id):
+    game.send_gamestate(connection_id)
+cmd_GET_GAMESTATE.argtypes = ''
+
 def cmd_QUERY(game, target_nick, msg, connection_id):
     if not connection_id in game.sessions:
         raise GameError('can only query when logged in')
@@ -28,8 +40,8 @@ def cmd_QUERY(game, target_nick, msg, connection_id):
     for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
         for c_id in game.sessions:
             if game.sessions[c_id] == t.id_:
-                game.io.send('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
-                game.io.send('LOG ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+                game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
                 return
         raise GameError('target user offline')
     raise GameError('can only query with registered nicknames')
@@ -39,21 +51,30 @@ 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'
 
+def cmd_ANNOTATE(game, yx, msg, connection_id):
+    if msg == ' ':
+        if yx in game.annotations:
+            del game.annotations[yx]
+    else:
+        game.annotations[yx] = msg
+    game.changed = True
+cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+
+def cmd_GET_ANNOTATION(game, yx, connection_id):
+    annotation = '(none)';
+    if yx in game.annotations:
+        annotation = game.annotations[yx]
+    game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
+cmd_GET_ANNOTATION.argtypes = 'yx_tuple: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_world(size)
+cmd_MAP.argtypes = 'yx_tuple:pos'