Ticket #3379: t3379_show_diplomacy_changes_to_observers_v1.patch

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

@@ -464 +464 @@
                 message = translate("You are now allied with %(player)s.");
             else if (msg.status == "enemy")
                 message = translate("You are now at war with %(player)s.");
             else // (msg.status == "neutral")
                 message = translate("You are now neutral with %(player)s.");
+            formatted = sprintf(message, { "player": '[color="'+ playerColor + '"]' + username + '[/color]' });
         }
         else if (msg.player1 == Engine.GetPlayerID())
         {
             [username, playerColor] = getUsernameAndColor(msg.player);
             if (msg.status == "ally")
                 message = translate("%(player)s is now allied with you.");
             else if (msg.status == "enemy")
                 message = translate("%(player)s is now at war with you.");
             else // (msg.status == "neutral")
                 message = translate("%(player)s is now neutral with you.");
+            formatted = sprintf(message, { "player": '[color="'+ playerColor + '"]' + username + '[/color]' });
+        }
+        else if (g_IsObserver)
+        {
+            [username, playerColor] = getUsernameAndColor(msg.player);
+            let [username2, playerColor2] = getUsernameAndColor(msg.player1);
+
+            if (msg.status == "ally")
+                message = translate("%(player1)s is now allied with %(player2)s.");
+            else if (msg.status == "enemy")
+                message = translate("%(player1)s is now at war with %(player2)s.");
+            else
+                message = translate("%(player1)s is now neutral with %(player2)s.");
+            
+            formatted = sprintf(message,
+            {
+                "player1": '[color="' + playerColor + '"]' + username + '[/color]',
+                "player2": '[color="' + playerColor2 + '"]' + username2 + '[/color]'
+            });
         }
         else // No need for other players to know of this.
             return;
-
-        formatted = sprintf(message, { "player": '[color="'+ playerColor + '"]' + username + '[/color]' });
         break;
     case "tribute":
         if (msg.player != Engine.GetPlayerID()) 
             return;
 

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

@@ -14 +14 @@
 var g_CivData = {};
 
 var g_GameSpeeds = {};
 var g_CurrentSpeed;
 
-var g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1 } };
+var g_PlayerAssignments = {};
 
 // Cache dev-mode settings that are frequently or widely used
 var g_DevSettings = {
     controlAll: false
 };
@@ -145 +145 @@
 }
 
 // Init
 function init(initData, hotloadData)
 {
+    g_IsObserver = Engine.GetPlayerID() == -1;
+
     if (initData)
     {
         g_IsNetworked = initData.isNetworked; // Set network mode
         g_IsController = initData.isController; // Set controller mode
         g_PlayerAssignments = initData.playerAssignments;
         g_MatchID = initData.attribs.matchID;
 
-        // Cache the player data
-        // (This may be updated at runtime by handleNetMessage)
-        g_Players = getPlayerData(g_PlayerAssignments);
-
         if (initData.savedGUIData)
             restoreSavedGameData(initData.savedGUIData);
 
         Engine.GetGUIObjectByName("gameSpeedButton").hidden = g_IsNetworked;
     }
-    else // Needed for autostart loading option
-    {
-        g_Players = getPlayerData(null);
-    }
+    else if (!g_IsObserver) // Needed for autostart loading option
+        g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1 } };
+
+    // Cache player data (This may be updated by handleNetMessage)
+    g_Players = getPlayerData(g_PlayerAssignments);
 
     // Cache civ data
     g_CivData = loadCivData();
     g_CivData["gaia"] = { "Code": "gaia", "Name": translate("Gaia") };
 
-    if (Engine.GetPlayerID() <= 0)
-        g_IsObserver = true;
-
     updateTopPanel();
 
     g_GameSpeeds = initGameSpeeds();
     g_CurrentSpeed = Engine.GetSimRate();
     var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");