Ticket #3102: t3102_survival_4.diff

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

@@ -196 +196 @@
         3,              // elevation
         4               // blend radius
     );
     createArea(placer, [terrainPainter, elevationPainter, paintClass(clWater)], null);
     
-    //creating female citizens
+    // Creating seeker woman (these need to have a lower ID than other starting woman for InitGame to identify them)
     var femaleLocation = getTIPIADBON([ix, iz], [mapSize / 2, mapSize / 2], [-3 , 3.5], 1, 3);
     if (femaleLocation !== undefined)
     {
         placeObject(femaleLocation[0], femaleLocation[1], "skirmish/units/default_support_female_citizen", id, playerAngle[i] + PI);
         addToClass(floor(femaleLocation[0]), floor(femaleLocation[1]), clWomen);

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

@@ -1 @@
-var treasures =
-[
+// Time in minutes when treasures are distributed periodically without random offset.
+var treasureTime = 3;
+
+// Time in minutes when resources are distributed periodically without random offset.
+var provideResourcesTime = 1.25;
+
+// Time in minutes after which resources are distributed periodically.
+var provideResourcesOffset = 14 + 2 * Math.random();
+
+var treasures = [
     "gaia/special_treasure_food_barrel",
     "gaia/special_treasure_food_bin",
     "gaia/special_treasure_food_crate",
     "gaia/special_treasure_food_jars",
     "gaia/special_treasure_metal",
     "gaia/special_treasure_stone",
     "gaia/special_treasure_wood",
     "gaia/special_treasure_wood",
     "gaia/special_treasure_wood"
 ];
-var attackerEntityTemplates =
-[
+
+var resourceMessage = false;
+
+// Templates of the attacking units, sorted by civ
+var attackerEntityTemplates = [
     [
         "units/athen_champion_infantry",
         "units/athen_champion_marine",
         "units/athen_champion_ranged",
-        "units/athen_siege_lithobolos_packed",
-        "units/athen_siege_oxybeles_packed",
+        "units/athen_mechanical_siege_lithobolos_packed",
+        "units/athen_mechanical_siege_oxybeles_packed"
     ],
     [
         "units/brit_champion_cavalry",
         "units/brit_champion_infantry",
-        "units/brit_mechanical_siege_ram",
+        "units/brit_mechanical_siege_ram"
     ],
     [
         "units/cart_champion_cavalry",
         "units/cart_champion_elephant",
         "units/cart_champion_infantry",
-        "units/cart_champion_pikeman",
+        "units/cart_champion_pikeman"
     ],
     [
         "units/gaul_champion_cavalry",
         "units/gaul_champion_fanatic",
         "units/gaul_champion_infantry",
-        "units/gaul_mechanical_siege_ram",
+        "units/gaul_mechanical_siege_ram"
     ],
     [
         "units/iber_champion_cavalry",
         "units/iber_champion_infantry",
-        "units/iber_mechanical_siege_ram",
+        "units/iber_mechanical_siege_ram"
     ],
     [
         "units/mace_champion_cavalry",
         "units/mace_champion_infantry_a",
         "units/mace_champion_infantry_e",
         "units/mace_mechanical_siege_lithobolos_packed",
-        "units/mace_mechanical_siege_oxybeles_packed",
+        "units/mace_mechanical_siege_oxybeles_packed"
     ],
     [
         "units/maur_champion_chariot",
         "units/maur_champion_elephant",
         "units/maur_champion_infantry",
         "units/maur_champion_maiden",
-        "units/maur_champion_maiden_archer",
+        "units/maur_champion_maiden_archer"
     ],
     [
         "units/pers_champion_cavalry",
-        "units/pers_champion_infantry",
         "units/pers_champion_elephant",
+        "units/pers_champion_infantry"
     ],
     [
         "units/ptol_champion_cavalry",
-        "units/ptol_champion_elephant",
+        "units/ptol_champion_elephant"
     ],
     [
         "units/rome_champion_cavalry",
         "units/rome_champion_infantry",
         "units/rome_mechanical_siege_ballista_packed",
-        "units/rome_mechanical_siege_scorpio_packed",
+        "units/rome_mechanical_siege_scorpio_packed"
     ],
     [
         "units/sele_champion_cavalry",
         "units/sele_champion_chariot",
         "units/sele_champion_elephant",
         "units/sele_champion_infantry_pikeman",
-        "units/sele_champion_infantry_swordsman",
+        "units/sele_champion_infantry_swordsman"
     ],
     [
         "units/spart_champion_infantry_pike",
         "units/spart_champion_infantry_spear",
         "units/spart_champion_infantry_sword",
-        "units/spart_mechanical_siege_ram",
+        "units/spart_mechanical_siege_ram"
     ],
 ];
 
 Trigger.prototype.StartAnEnemyWave = function()
 {
     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
-    let nextTime = Math.round(120000 + Math.random() * 60000);
+    let nextTime = Math.round(120000 + Math.random() * 60 * 1000);
     let attackerCount = Math.round(cmpTimer.GetTime() / nextTime / attackerEntities.length);
 
-    // spawn attackers
-    let attackers =  [];
-    for (let attackerEntity of attackerEntities)
-        attackers.push(TriggerHelper.SpawnUnitsFromTriggerPoints("A", attackerEntity, attackerCount, 0));
+    let attackers = attackerEntities.map(ent =>
+        TriggerHelper.SpawnUnitsFromTriggerPoints("A", ent, attackerCount, 0));
 
     for (let entityType of attackers)
     {
         for (let origin in entityType)
         {
             let cmpPlayer = QueryOwnerInterface(+origin, IID_Player);
-            if (cmpPlayer.GetState() != "active")
+            if (!cmpPlayer || !cmpTrigger.playerCivicCenter[cmpPlayer.GetPlayerID()])
                 continue;
 
-            let cmpPosition =  Engine.QueryInterface(this.playerCivicCenter[cmpPlayer.GetPlayerID()], IID_Position);
-            // this shouldn't happen if the player is still active
+            let cmpPosition = Engine.QueryInterface(cmpTrigger.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
-            let cmd = cmpPosition.GetPosition();
-            cmd.type = "attack-walk";
-            cmd.entities = entityType[origin];
-            cmd.queued = true;
-            cmd.targetClasses = undefined;
-            // send the attack-walk command
-            ProcessCommand(0, cmd);
+            let pos = cmpPosition.GetPosition();
+            ProcessCommand(0, {
+                "type": "attack-walk",
+                "entities": entityType[origin],
+                "x": pos.x,
+                "z": pos.z,
+                "queued": true
+            });
         }
     }
 
     let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGUIInterface.PushNotification({
@@ -128 +137 @@
         "translateMessage": true
     });
     cmpTrigger.DoAfterDelay(nextTime, "StartAnEnemyWave", {}); // The next wave will come in 3 minutes
 };
 
+/**
+ * Find all of the civic centers and females, disable some structures, setup activity watch.
+ */
 Trigger.prototype.InitGame = function()
 {
     let numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
-    // Find all of the civic centers, disable some structures
     for (let i = 1; i < numberOfPlayers; ++i)
     {
         let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
         let playerEntities = cmpRangeManager.GetEntitiesByPlayer(i); // Get all of each player's entities
 
+        let foundSeeker = false;
         for (let entity of playerEntities)
+        {
             if (TriggerHelper.EntityHasClass(entity, "CivilCentre"))
                 cmpTrigger.playerCivicCenter[i] = entity;
+
+            if (TriggerHelper.EntityHasClass(entity, "Female") && !foundSeeker)
+            {
+                foundSeeker = true;
+                let cmpDamageReceiver = Engine.QueryInterface(entity, IID_DamageReceiver);
+                cmpDamageReceiver.SetInvulnerability(true);
+
+                let cmpHealth = Engine.QueryInterface(entity, IID_Health);
+                cmpHealth.SetUndeletable(true);
+            }
+        }
     }
 
     // Fix alliances
     /* Until we can do something about limiting the victory conditions available for this map to "None"
     for (let i = 1; i < numberOfPlayers; ++i)
@@ -156 +180 @@
     }*/
 
     // Make gaia black
     QueryPlayerIDInterface(0).SetColor(0, 0, 0);
 
-    // Place the treasures
     this.PlaceTreasures();
 
     // Disable farms, civic centers and walls for all players
     for (let i = 1; i < numberOfPlayers; ++i)
     {
         let cmpPlayer = QueryPlayerIDInterface(i);
         let civ = cmpPlayer.GetCiv();
+
         cmpPlayer.SetDisabledTemplates([
             "structures/" + civ + "_field",
             "structures/" + civ + "_corral",
             "structures/" + civ + "_civil_centre",
             "structures/" + civ + "_military_colony",
@@ -181 +205 @@
 {
     let point = ["B", "C", "D"][Math.floor(Math.random() * 3)];
     let triggerPoints = cmpTrigger.GetTriggerPoints(point);
     for (let point of triggerPoints)
     {
-        let template = treasures[Math.floor(Math.random() * treasures.length)]
-        TriggerHelper.SpawnUnits(point, template, 1, 0);
+        let template = treasures[Math.floor(Math.random() * treasures.length)];
+        let cmpPosition = Engine.QueryInterface(point, IID_Position);
+        let ent = Engine.AddEntity(template);
+
+        let cmpEntOwnership = Engine.QueryInterface(ent, IID_Ownership);
+        let cmpEntPosition = Engine.QueryInterface(ent, IID_Position);
+
+        if (cmpEntOwnership)
+            cmpEntOwnership.SetOwner(0);
+
+        let xOffset = RandomInt(0, 23);
+        let zOffset = RandomInt(0, 23);
+
+        if (Math.random() >= 0.8)
+        {
+            xOffset += RandomInt(5, 8);
+            zOffset += RandomInt(5, 8);
+        }
+
+        if (Math.round(Math.random()) == 1)
+            xOffset = -xOffset;
+
+        if (Math.round(Math.random()) == 1)
+            zOffset = -zOffset;
+
+        cmpEntPosition.JumpTo(cmpPosition.GetPosition().x + xOffset, cmpPosition.GetPosition().z - zOffset);
     }
-    cmpTrigger.DoAfterDelay(4*60*1000, "PlaceTreasures", {}); //Place more treasures after 4 minutes
+
+    cmpTrigger.DoAfterDelay((treasureTime + Math.random()) * 60 * 1000, "PlaceTreasures", {});
+
+    let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    cmpGUIInterface.PushNotification({
+        "message": markForTranslation("New treasures have been placed!"),
+        "translateMessage": true
+    });
 };
 
 Trigger.prototype.InitializeEnemyWaves = function()
 {
     let time = (5 + Math.round(Math.random() * 10)) * 60 * 1000;
     let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    cmpGUIInterface.PushNotification({
+        "message": markForTranslation("Welcome to Survival of the Fittest"),
+        "translateMessage": true
+    });
+    cmpGUIInterface.PushNotification({
+        "message": markForTranslation("Collect treasures with your woman to prepare for the enemies."),
+        "translateMessage": true
+    });
     cmpGUIInterface.AddTimeNotification({
         "message": markForTranslation("The first wave will start in %(time)s!"),
         "translateMessage": true
     }, time);
+
     cmpTrigger.DoAfterDelay(time, "StartAnEnemyWave", {});
 };
 
 Trigger.prototype.DefeatPlayerOnceCCIsDestroyed = function(data)
 {
-    // Defeat a player that has lost his civic center
-    if (data.entity == cmpTrigger.playerCivicCenter[data.from])
-    {
+    if (data.entity == cmpTrigger.playerCivicCenter[data.from] && data.to == -1)
         TriggerHelper.DefeatPlayer(data.from);
+};
 
-        // Check if only one player remains. He will be the winner.
-        let lastPlayerStanding = 0;
-        let numPlayersStanding = 0;
-        let numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
-        for (let i = 1; i < numberOfPlayers; ++i)
-        {
-            if (QueryPlayerIDInterface(i).GetState() == "active")
-            {
-                lastPlayerStanding = i;
-                ++numPlayersStanding;
-            }
-        }
-        if (numPlayersStanding == 1)
-            TriggerHelper.SetPlayerWon(lastPlayerStanding);
+Trigger.prototype.provideResources = function(data)
+{
+    if (!resourceMessage)
+    {
+        let cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+        cmpGUIInterface.PushNotification({
+            "message": markForTranslation("From now on, all players will receive some resources from time to time."),
+            "translateMessage": true
+        });
+        resourceMessage = true;
+    }
+
+    let resources = {};
+    for (let type of ["food", "wood", "stone", "metal"])
+        resources[type] = 50 + Math.round(Math.random() * 100);
+
+    let numberOfPlayers = TriggerHelper.GetNumberOfPlayers();
+    for (let i = 1; i < numberOfPlayers; ++i)
+    {
+        let cmpPlayer = QueryPlayerIDInterface(i);
+        cmpPlayer.AddResources(resources);
     }
+
+    cmpTrigger.DoAfterDelay((provideResourcesTime +  Math.random() / 2) * 60 * 1000, "provideResources" , {});
 };
 
 var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
 cmpTrigger.playerCivicCenter = {};
+
 cmpTrigger.DoAfterDelay(0, "InitGame", {});
 cmpTrigger.DoAfterDelay(1000, "InitializeEnemyWaves", {});
+cmpTrigger.DoAfterDelay(provideResourcesOffset * 60 * 1000, "provideResources" , {});
 
 cmpTrigger.RegisterTrigger("OnOwnershipChanged", "DefeatPlayerOnceCCIsDestroyed", { "enabled": true });