Ticket #3792: stackable.2.diff

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

@@ -23 +23 @@
 };
 
 // We can modify identifier if we want stackable auras in some case.
 Auras.prototype.GetModifierIdentifier = function(name)
 {
-        return name;
+    if (this.auras[name].stackable)
+        return name + this.entity;
+    return name;
 };
 
 Auras.prototype.GetDescriptions = function()
 {
     let auraNames = this.GetAuraNames();
@@ -302 +304 @@
         this.RemoveBonus(name, [structure]);
 };
 
 Auras.prototype.RemoveTemplateBonus = function(name)
 {
-    if (!this.CanApply(name))
-        return;
     if (!this.IsGlobalAura(name))
         return;
 
     var modifications = this.GetModifications(name);
     var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
@@ -353 +353 @@
     if (!validEnts.length)
         return;
 
     this[name].targetUnits = this[name].targetUnits.filter(v => validEnts.indexOf(v) == -1);
 
-    if (!this.CanApply(name))
-        return;
-
     var modifications = this.GetModifications(name);
     var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
 
     for (let mod of modifications)
         cmpAuraManager.RemoveBonus(mod.value, validEnts, this.GetModifierIdentifier(name));

binaries/data/mods/public/simulation/data/auras/wonder_pop_1.json

@@ -1 +1 @@
 {
     "type": "global",
     "affects": ["Player"],
     "modifications": [ { "value": "Player/MaxPopulation", "add": 10 } ],
     "auraName": "Wonder Aura",
-    "auraDescription": "+10 max. population cap"
+    "auraDescription": "+10 max. population cap",
+    "stackable": true
 }

binaries/data/mods/public/simulation/data/auras/wonder_pop_2.json

@@ -2 +2 @@
     "type": "global",
     "affects": ["Player"],
     "modifications": [ { "value": "Player/MaxPopulation", "add": 40 } ],
     "auraName": "Wonder Aura",
     "auraDescription": "+40 extra max. population cap (requires \"Glorious Expansion\" tech)",
-    "requiredTechnology": "pop_wonder"
+    "requiredTechnology": "pop_wonder",
+    "stackable": true
 }