Ticket #2160: Regicide_v1.1.patch

binaries/data/mods/public/maps/scripts/Regicide.js

@@ -51 +51 @@
             getSpawnPreference(entity2) - getSpawnPreference(entity1));
 
         this.regicideHeroes[playerID] = this.SpawnRegicideHero(playerID, heroTemplates[playersCivs[playerID]], spawnPoints);
+
+        let cmpAttack = Engine.QueryInterface(this.regicideHeroes[playerID], IID_Attack);
+        cmpAttack.SetEnabled(false);
+
+        let cmpAuras = Engine.QueryInterface(this.regicideHeroes[playerID], IID_Auras);
+        for (let aura of cmpAuras.GetAuraNames())
+            if (cmpAuras.IsGlobalAura(aura))
+                cmpAuras.RemoveTemplateBonus(aura);
     }
 };
 
@@ -98 +106 @@
     return undefined;
 };
 
+Trigger.prototype.CityPhaseReached = function(data)
+{
+    if (data.tech.indexOf("phase_city") == -1)
+        return;
+
+    let cmpAttack = Engine.QueryInterface(this.regicideHeroes[data.player], IID_Attack);
+    cmpAttack.SetEnabled(true);
+
+    let cmpAuras = Engine.QueryInterface(this.regicideHeroes[data.player], IID_Auras);
+    for (let aura of cmpAuras.GetAuraNames())
+        if (cmpAuras.IsGlobalAura(aura))
+            cmpAuras.ApplyTemplateBonus(aura, [data.player]);
+
+};
+
 let cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
 cmpTrigger.regicideHeroes = [];
 cmpTrigger.DoAfterDelay(0, "InitRegicideGame", {});
 cmpTrigger.RegisterTrigger("OnOwnershipChanged", "CheckRegicideDefeat", { "enabled": true });
+cmpTrigger.RegisterTrigger("OnResearchFinished", "CityPhaseReached", { "enabled": true });

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

@@ -202 +202 @@
 
 Attack.prototype.Init = function()
 {
+    this.enabled = true;
 };
 
 Attack.prototype.Serialize = null; // we have no dynamic state to save
 
+Attack.prototype.GetEnabled = function(enabled)
+{
+    return this.enabled;
+};
+
+Attack.prototype.SetEnabled = function(enabled)
+{
+    this.enabled = enabled;
+};
+
 Attack.prototype.GetAttackTypes = function()
 {
     return ["Melee", "Ranged", "Capture"].filter(type => !!this.template[type]);
@@ -231 +242 @@
 
 Attack.prototype.CanAttack = function(target)
 {
+    if (!this.enabled)
+        return false;
+
     let cmpFormation = Engine.QueryInterface(target, IID_Formation);
     if (cmpFormation)
         return true;