Ticket #3198: t3198_send_diplomacy_message_only_if_it_changes_better.patch

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

@@ -251 +251 @@
     chatWindow.hidden = !chatWindow.hidden;
 }
 
 function setDiplomacy(data)
 {
-    Engine.PostNetworkCommand({"type": "diplomacy", "to": data.to, "player": data.player});
+    var we = Engine.GetPlayerID(); 
+    
+    // If the diplomacy button was already clicked before, return
+    let setting = data.to.charAt(0).toUpperCase() + data.to.slice(1);
+    let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(data.player-1)+"]");
+    if (button.caption == "x")
+        return;
+    
+    // If the diplomacy button is clicked, update the buttons immediately to prevent
+    // sending duplicate messages ((see ticket #3198)
+    for each (let setting in ["Ally", "Neutral", "Enemy"])
+    {
+        let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(data.player-1)+"]");
+        button.caption = (data.to == setting.toLowerCase()) ? "x" : "";
+    }
+    
+    // Send update only if diplomacy actually changed
+    if ((data.to == "ally" && !g_Players[we].isAlly[data.player]) 
+            || (data.to == "neutral" && !g_Players[we].isNeutral[data.player]) 
+            || (data.to == "enemy" && !g_Players[we].isEnemy[data.player])) 
+            Engine.PostNetworkCommand({"type": "diplomacy", "to": data.to, "player": data.player}); 
 }
 
 function tributeResource(data)
 {
     Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts":  data.amounts});
@@ -358 +378 @@
         // Set up the buttons
         for each (let setting in ["Ally", "Neutral", "Enemy"])
         {
             let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(i-1)+"]");
 
-            button.caption = g_Players[we]["is"+setting][i] ? translate("x") : "";
+            button.caption = g_Players[we]["is"+setting][i] ? "x" : "";
             button.onpress = (function(e){ return function() { setDiplomacy(e) } })({"player": i, "to": setting.toLowerCase()});
             button.hidden = false;
         }
     }