Send game messages on player logins/renames.

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

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 09f22c081beb346070f5bbc7175110577471378b..96c5d226dedd400d2c14717d3207e004dae90432 100644 (file)
--- 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,34 @@ 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)
-    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)
+    if connection_id in game.sessions:
+        t_id = game.sessions[connection_id]
+        t = game.get_thing(t_id, False)
+        old_nick = t.nickname
+        t.nickname = nick
+        game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
+    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('LOGIN_OK')
+        t.nickname = nick
+        game.io.send('CHAT ' + quote(t.nickname + ' entered the map.'))
+        game.io.send('PLAYER_ID %s' % t.id_, connection_id)
+    game.changed = True
 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 +44,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')
@@ -37,4 +53,32 @@ cmd_QUERY.argtypes = 'string string'
 
 def cmd_PING(game, connection_id):
     game.io.send('PONG')
-cmd_QUERY.argtypes = ''
+cmd_PING.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'