Ticket #3102: t3102_survival_letsvar.diff

binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js

@@ -87 +87 @@
 
 Trigger.prototype.StartAnEnemyWave = function()
 {
-    var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-    var attackerEntities = attackerEntityTemplates[Math.floor(Math.random() * attackerEntityTemplates.length)];
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    let attackerEntities = attackerEntityTemplates[Math.floor(Math.random() * attackerEntityTemplates.length)];
     // A soldier for each 2-3 minutes of the game. Should be waves of 20 soldiers after an hour
-    var nextTime = Math.round(120000 + Math.random() * 60000);
-    var attackerCount = Math.round(cmpTimer.GetTime() / nextTime / attackerEntities.length);
+    let nextTime = Math.round(120000 + Math.random() * 60000);
+    let attackerCount = Math.round(cmpTimer.GetTime() / nextTime / attackerEntities.length);
 
     // spawn attackers
-    var attackers =  [];
+    let attackers =  [];
     for (let attackerEntity of attackerEntities)
         attackers.push(TriggerHelper.SpawnUnitsFromTriggerPoints("A", attackerEntity, attackerCount, 0));
 
-    for (var entityType of attackers)
+    for (let entityType of attackers)
     {
-        for (var origin in entityType)
+        for (let origin in entityType)
         {
-            var cmpPlayer = QueryOwnerInterface(+origin, IID_Player);
+            let cmpPlayer = QueryOwnerInterface(+origin, IID_Player);
             if (cmpPlayer.GetState() != "active")
                 continue;
 
-            var cmpPosition =  Engine.QueryInterface(this.playerCivicCenter[cmpPlayer.GetPlayerID()], IID_Position);
+            let cmpPosition =  Engine.QueryInterface(this.playerCivicCenter[cmpPlayer.GetPlayerID()], IID_Position);
             // this shouldn't happen if the player is still active
             if (!cmpPosition || !cmpPosition.IsInWorld)
                 continue;
 
             // store the x and z coordinates in the command
-            var cmd = cmpPosition.GetPosition();
+            let cmd = cmpPosition.GetPosition();
             cmd.type = "attack-walk";
             cmd.entities = entityType[origin];
             cmd.queued = true;
@@ -122 +122 @@
         }
     }
 
-    var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGUIInterface.PushNotification({
         "players": [1,2,3,4,5,6,7,8], 
         "message": markForTranslation("An enemy wave is attacking!"),
@@ -133 +133 @@
 
 Trigger.prototype.InitGame = function()
 {
-    var numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
+    let numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
     // Find all of the civic centers, disable some structures
-    for (var i = 1; i < numberOfPlayers; ++i)
+    for (let i = 1; i < numberOfPlayers; ++i)
     {
-        var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-        var playerEntities = cmpRangeManager.GetEntitiesByPlayer(i); // Get all of each player's entities
+        let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+        let playerEntities = cmpRangeManager.GetEntitiesByPlayer(i); // Get all of each player's entities
         
         for (let entity of playerEntities)
             if (TriggerHelper.EntityHasClass(entity, "CivilCentre"))
@@ -147 +147 @@
 
     // Fix alliances
     /* Until we can do something about limiting the victory conditions available for this map to "None"
-    for (var i = 1; i < numberOfPlayers; ++i)
+    for (let i = 1; i < numberOfPlayers; ++i)
     {
-        var cmpPlayer = QueryPlayerIDInterface(i);
-        for (var j = 1; j < numberOfPlayers; ++j)
+        let cmpPlayer = QueryPlayerIDInterface(i);
+        for (let j = 1; j < numberOfPlayers; ++j)
             if (i != j) 
                 cmpPlayer.SetAlly(j);
         cmpPlayer.SetLockTeams(true);
@@ -163 +163 @@
     this.PlaceTreasures();
     
     // Disable farms, civic centers and walls for all players 
-    for (var i = 1; i < numberOfPlayers; ++i) 
+    for (let i = 1; i < numberOfPlayers; ++i) 
     { 
         let cmpPlayer = QueryPlayerIDInterface(i);
-        var civ = cmpPlayer.GetCiv(); 
+        let civ = cmpPlayer.GetCiv(); 
         cmpPlayer.SetDisabledTemplates([
             "structures/" + civ + "_field",
             "structures/" + civ + "_corral",
@@ -181 +181 @@
 Trigger.prototype.PlaceTreasures = function()
 {
     let point = ["B", "C", "D"][Math.floor(Math.random() * 3)];
-    var triggerPoints = cmpTrigger.GetTriggerPoints(point);
-    for (var point of triggerPoints)
+    let triggerPoints = cmpTrigger.GetTriggerPoints(point);
+    for (let point of triggerPoints)
     {
-        var template = treasures[Math.floor(Math.random() * treasures.length)]
+        let template = treasures[Math.floor(Math.random() * treasures.length)]
         TriggerHelper.SpawnUnits(point, template, 1, 0);
     }
     cmpTrigger.DoAfterDelay(4*60*1000, "PlaceTreasures", {}); //Place more treasures after 4 minutes
@@ -192 +192 @@
 
 Trigger.prototype.InitializeEnemyWaves = function()
 {
-    var time = (5 + Math.round(Math.random() * 10)) * 60 * 1000;
-    var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    let time = (5 + Math.round(Math.random() * 10)) * 60 * 1000;
+    let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGUIInterface.AddTimeNotification({
         "players": [1,2,3,4,5,6,7,8], 
         "message": markForTranslation("The first wave will start in %(time)s!"),
@@ -210 +210 @@
         TriggerHelper.DefeatPlayer(data.from);
     
         // Check if only one player remains. He will be the winner.
-        var lastPlayerStanding = 0;
-        var numPlayersStanding = 0;
-        var numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
-        for (var i = 1; i < numberOfPlayers; ++i)
+        let lastPlayerStanding = 0;
+        let numPlayersStanding = 0;
+        let numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
+        for (let i = 1; i < numberOfPlayers; ++i)
         {
             if (QueryPlayerIDInterface(i).GetState() == "active")
             {