Ticket #4308: see_tributes_between_allies_v1.2.patch

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

@@ -864 +864 @@
     });
 }
 
 function formatTributeMessage(msg)
 {
-    // Check observer first, since we also want to see if the selected player in the developer-overlay has sent tributes
+    // Show tributes sent between our allies, or all tributes sent if we are an observer
     let message = "";
-    if (g_IsObserver)
-        message = translate("%(player)s has sent %(player2)s %(amounts)s.");
-    else if (msg.targetPlayer == Engine.GetPlayerID())
+    if (msg.targetPlayer == Engine.GetPlayerID())
         message = translate("%(player)s has sent you %(amounts)s.");
+    else if (g_IsObserver ||
+             g_GameAttributes.settings.LockTeams  &&
+               g_Players[msg.sourcePlayer].isMutualAlly[Engine.GetPlayerID()] &&
+               g_Players[msg.targetPlayer].isMutualAlly[Engine.GetPlayerID()])
+        message = translate("%(player)s has sent %(player2)s %(amounts)s.");
 
     return sprintf(message, {
         "player": colorizePlayernameByID(msg.sourcePlayer),
         "player2": colorizePlayernameByID(msg.targetPlayer),
         "amounts": getLocalizedResourceAmounts(msg.amounts)