Send game messages on player logins/renames.

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 8aec89b6583f3376e7acdeebf61fc12fd25e8c89..96c5d226dedd400d2c14717d3207e004dae90432 100644 (file)
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -17,15 +17,19 @@ def cmd_LOGIN(game, nick, connection_id):
     if connection_id in game.sessions:
         t_id = game.sessions[connection_id]
         t = game.get_thing(t_id, False)
     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)
+        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_
     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 ' + quote('you are now: ' + nick), connection_id)
-    t.nickname = nick
-    game.io.send('PLAYER_ID %s' % t.id_, connection_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):
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_GET_GAMESTATE(game, connection_id):

diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index 72ebf78d97c7c0dc2100192ecf57aa94540a8f92..9c70d829b59ffbaa1f1cf1898a0a839afbabd209 100644 (file)
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -413,8 +413,6 @@ server.websocket.onmessage = function (event) {
      tui.log_msg('# ' + tokens[1], 1);
   } else if (tokens[0] === 'PLAYER_ID') {
       game.player_id = parseInt(tokens[1]);
      tui.log_msg('# ' + tokens[1], 1);
   } else if (tokens[0] === 'PLAYER_ID') {
       game.player_id = parseInt(tokens[1]);

-  } else if (tokens[0] === 'META') {
-     tui.log_msg('@ ' + tokens[1]);

   } else if (tokens[0] === 'LOGIN_OK') {
       server.send(['GET_GAMESTATE']);
       tui.log_msg('@ ' + tokens[1]);
   } else if (tokens[0] === 'LOGIN_OK') {
       server.send(['GET_GAMESTATE']);
       tui.log_msg('@ ' + tokens[1]);