Ticket #2749: t2749_ceasefire_cleanup_v2.patch

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

@@ -1 +1 @@
 function CeasefireManager() {}
 
-CeasefireManager.prototype.Schema =
-    "<a:help>Lists the sound groups associated with this unit.</a:help>" +
-    "<a:example>" +
-        "<SoundGroups>" +
-            "<ceasefire>interface/alarm/alarm_alert_0.xml</ceasefire>" +
-        "</SoundGroups>" +
-    "</a:example>" +
-    "<element name='SoundGroups'>" +
-        "<zeroOrMore>" + /* TODO: make this more specific, like a list of specific elements */
-            "<element>" +
-                "<anyName/>" +
-                "<text/>" +
-            "</element>" +
-        "</zeroOrMore>" +
-    "</element>";
+CeasefireManager.prototype.Schema = "<a:component type='system'/><empty/>";
 
 CeasefireManager.prototype.Init = function()
 {
     // Weather or not ceasefire is active currently.
     this.ceasefireIsActive = false;
@@ -83 +69 @@
     // Save diplomacy and set everyone neutral
     if (!this.ceasefireIsActive)
     {
         // Save diplomacy
         var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
-        for (var i = 1; i < playerEntities.length; i++)
-        {
+        for (var i = 1; i < playerEntities.length; ++i)
             // Copy array with slice(), otherwise it will change
-            var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
-            this.diplomacyBeforeCeasefire.push(cmpPlayer.GetDiplomacy().slice());
-        }
+            this.diplomacyBeforeCeasefire.push(Engine.QueryInterface(playerEntities[i], IID_Player).GetDiplomacy().slice());
 
         // Set every enemy (except gaia) to neutral
-        for (var i = 1; i < playerEntities.length; i++)
-        {
-            var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
-            for (var j = 1; j < playerEntities.length; j++)
-            {
+        for (var i = 1; i < playerEntities.length; ++i)
+            for (var j = 1; j < playerEntities.length; ++j)
                 if (this.diplomacyBeforeCeasefire[i-1][j] < 0)
-                    cmpPlayer.SetNeutral(j);
-            }
-        }
+                    Engine.QueryInterface(playerEntities[i], IID_Player).SetNeutral(j);
     }
     
     // Save other data
     this.ceasefireIsActive = true;
     this.ceasefireTime = ceasefireTime;
@@ -113 +91 @@
     Engine.PostMessage(SYSTEM_ENTITY, MT_CeasefireStarted);
 
     // Add timers for countdown message and reseting diplomacy
     this.stopCeasefireTimer = cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_CeasefireManager, "StopCeasefire", this.ceasefireTime);
     this.ceasefireCountdownMessageTimer = cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_CeasefireManager, "ShowCeasefireCountdownMessage",
-            this.ceasefireTime - this.countdownMessageDuration, this.countdownMessageDuration);
+            this.ceasefireTime - this.countdownMessageDuration);
 };
 
-CeasefireManager.prototype.ShowCeasefireCountdownMessage = function(duration)
+CeasefireManager.prototype.ShowCeasefireCountdownMessage = function()
 {
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     this.ceasefireCountdownMessage = cmpGuiInterface.AddTimeNotification({
         "message": markForTranslation("You can attack in %(time)s"),
         "translateMessage": true
-    }, duration);
+    }, this.countdownMessageDuration);
 };
 
 CeasefireManager.prototype.StopCeasefire = function()
 {
     var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
@@ -140 +118 @@
         "message": markForTranslation("You can attack now!"),
         "translateMessage": true
     }, this.postCountdownMessageDuration);
     
     // Reset diplomacies to original settings
-    var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     var playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
-    for (var i = 1; i < playerEntities.length; i++)
-    {
-        var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
-        cmpPlayer.SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
-    }       
+    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++)
-    {
-        var cmpPlayer = Engine.QueryInterface(playerEntities[i], IID_Player);
-        for (var j = 1; j < playerEntities.length; j++)
-        {
+    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;

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

@@ -694 +694 @@
 {
     var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
     notification.endTime = duration + cmpTimer.GetTime();
     notification.id = ++this.timeNotificationID;
 
-    // Let all players receive the notification by default
+    // Let all players and observers receive the notification by default
     if (notification.players == undefined)
     {
         var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
         var numPlayers = cmpPlayerManager.GetNumPlayers();
-        notification.players = [];
-        for (var i = 1; i < numPlayers; i++)
+        notification.players = [-1];
+        for (var i = 1; i < numPlayers; ++i)
             notification.players.push(i);
     }
-    
     this.timeNotifications.push(notification);
     this.timeNotifications.sort(function (n1, n2){return n2.endTime - n1.endTime});
 
     cmpTimer.SetTimeout(this.entity, IID_GuiInterface, "DeleteTimeNotification", duration, this.timeNotificationID);
 

binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js

@@ -3 +3 @@
 Engine.LoadComponentScript("interfaces/AlertRaiser.js");
 Engine.LoadComponentScript("interfaces/Auras.js");
 Engine.LoadComponentScript("interfaces/Barter.js");
 Engine.LoadComponentScript("interfaces/Builder.js");
 Engine.LoadComponentScript("interfaces/Capturable.js");
+Engine.LoadComponentScript("interfaces/CeasefireManager.js");
 Engine.LoadComponentScript("interfaces/DamageReceiver.js");
 Engine.LoadComponentScript("interfaces/EndGameManager.js");
 Engine.LoadComponentScript("interfaces/EntityLimits.js");
 Engine.LoadComponentScript("interfaces/Foundation.js");
 Engine.LoadComponentScript("interfaces/GarrisonHolder.js");