Ticket #1767: 1767_chat.diff

binaries/data/mods/public/gui/session/messages.js

@@ -92 +92 @@
         // If the diplomacy panel is open refresh it.
         if (isDiplomacyOpen)
             openDiplomacy();
+
+        g_Players = getPlayerData(g_PlayerAssignments);
     },
     "quit": function(notification, player)
     {
@@ -400 +402 @@
         if (n < 0)
             n = 0;
         playerColor = g_Players[n].color.r + " " + g_Players[n].color.g + " " + g_Players[n].color.b;
-        username = escapeText(playerAssignments[msg.guid].name);
+        if (g_IsNetworked && n == Engine.GetPlayerID())
+            username = translate("You");
+        else
+            username = escapeText(playerAssignments[msg.guid].name);
 
         // Parse in-line commands in regular messages.
         if (msg.type == "message")
@@ -420 +425 @@
         playerColor = "255 255 255";
         username = translate("Unknown player");
     }
-    
+
     var formatted;
-    
+
     switch (msg.type)
     {
     case "connect":
@@ -587 +592 @@
         sender = playerAssignments[msg.guid].player;
     else
         sender = msg.player;
-    
+
     var recurse = false;
     var split = msg.text.split(/\s/);
 
@@ -613 +618 @@
             msg.hide = true;
         recurse = true;
         break;
+    case "/allies":
+        if (Engine.GetPlayerID() == sender || (g_Players[Engine.GetPlayerID()] && g_Players[Engine.GetPlayerID()].isMutualAlly[sender]))
+            msg.context = translate("Ally");
+        else
+            msg.hide = true;
+
+        recurse = true;
+        break;
     case "/enemy":
         // Check if we are in a team.
-        if (g_Players[Engine.GetPlayerID()] && g_Players[Engine.GetPlayerID()].team != -1)
-        {
-            if (g_Players[Engine.GetPlayerID()].team == g_Players[sender].team && sender != Engine.GetPlayerID())
-                msg.hide = true;
-            else
-                msg.context = translate("Enemy");
-        }
+        if (Engine.GetPlayerID() == sender || g_Players[sender].isEnemy[Engine.GetPlayerID()])
+            msg.context = translate("Enemy");
+        else
+            msg.hide = true;
+
         recurse = true;
         break;
     case "/me":