Ticket #3413: t3413_hide_diplomacy_ceasefire_counter_and_dont_spam_v2.patch

binaries/data/mods/public/gui/common/functions_global_object.js

@@ -108 +108 @@
             else
                 caption += timeToString(g_SimState.timeElapsed);
             caption += "\n";
             ++linesCount;
         }
-        if (Engine.ConfigDB_GetValue("user", "gui.session.ceasefirecounter") === "true" && g_SimState.ceasefireActive)
+
+        var diplomacyCeasefireCounter = Engine.GetGUIObjectByName("diplomacyCeasefireCounter");
+        if (g_SimState.ceasefireActive)
         {
+            // Update ceasefire counter in the diplomacy window
             var remainingTimeString = timeToString(g_SimState.ceasefireTimeRemaining);
-            caption += remainingTimeString + "\n";
-            
-            var diplomacyCeasefireCounter = Engine.GetGUIObjectByName("diplomacyCeasefireCounter");
             diplomacyCeasefireCounter.caption = sprintf(translateWithContext("ceasefire", "Time remaining until ceasefire is over: %(time)s."), {"time": remainingTimeString});
-            ++linesCount;
+
+            // Update ceasefire overlay counter
+            if (Engine.ConfigDB_GetValue("user", "gui.session.ceasefirecounter") === "true")
+            {
+                caption += remainingTimeString + "\n";
+                ++linesCount;
+            }
+        }
+        else if (!diplomacyCeasefireCounter.hidden)
+        {
+            diplomacyCeasefireCounter.hidden = true;
+            updateDiplomacy();
         }
 
         g_ResearchListTop = 4;
         if (linesCount)
             g_ResearchListTop += 14 * linesCount;

binaries/data/mods/public/simulation/components/CeasefireManager.js

@@ -121 +121 @@
     
     // Reset diplomacies to original settings
     var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
     for (var i = 1; i < playerEntities.length; ++i)
         Engine.QueryInterface(playerEntities[i], IID_Player).SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
-
-    // Send chat notifications and update the diplomacy screen
-    for (var i = 1; i < playerEntities.length; ++i)
-        for (var j = 1; j < playerEntities.length; ++j)
-            if (i != j && this.diplomacyBeforeCeasefire[i-1][j] == -1)
-                cmpGuiInterface.PushNotification({"type": "diplomacy", "players": [j], "player1": [i], "status": "enemy"});
     
     // Reset values
     this.ceasefireIsActive = false;
     this.ceasefireTime = 0;
     this.ceasefireStartedTime = 0;