Ticket #3792: 3792.diff

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

@@ -58 +58 @@
                 "<optional>" +
                     "<element name='AffectedPlayers' a:help='Affected players'>" +
                         "<text/>" +
                     "</element>" +
                 "</optional>" +
+                "<optional>" +
+                "<element name='Stackable' a:help='Allow multiple applications of this aura'>" +
+                        "<data type='boolean'/>" +
+                    "</element>" +
+                "</optional>" +
             "</interleave>" +
         "</element>" +
     "</oneOrMore>";
 
 Auras.prototype.Init = function()
@@ -91 +96 @@
         }
         this.auras[name] = aura;
     }
 };
 
+Auras.prototype.GetModifierIdentifier = function(name, mod)
+{
+        let identifier = name + "/" + mod.value + "/";
+        if (this.template[name].Stackable)
+            return identifier + this.entity;
+        // We add add/mul to prevent applying the same aura of different templates
+        return identifier + (mod.Add || 0) + "/" + (mod.Multiply || 1);
+};
+
 Auras.prototype.GetDescriptions = function()
 {
     var ret = {};
     for each (var aura in this.template)
         if (aura.AuraName)
@@ -329 +343 @@
     var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
     var classes = this.GetClasses(name);
 
     for (let mod of modifications)
         for (let player of players)
-            cmpAuraManager.ApplyTemplateBonus(mod.value, player, classes, mod, this.templateName + "/" + name + "/" + mod.value);
+            cmpAuraManager.ApplyTemplateBonus(mod.value, player, classes, mod, this.GetModifierIdentifier(name, mod));
 };
 
 Auras.prototype.RemoveFormationBonus = function(memberList)
 {
     var auraNames = this.GetAuraNames().filter(n => this.IsFormationAura(n));
@@ -358 +372 @@
     var classes = this.GetClasses(name);
     var players =  this.GetAffectedPlayers(name);
 
     for each (var mod in modifications)
         for each (var player in players)
-            cmpAuraManager.RemoveTemplateBonus(mod.value, player, classes, this.templateName + "/" + name + "/" + mod.value);
+            cmpAuraManager.RemoveTemplateBonus(mod.value, player, classes, this.GetModifierIdentifier(name, mod));
 };
 
 Auras.prototype.ApplyBonus = function(name, ents)
 {
     var validEnts = this.GiveMembersWithValidClass(name, ents);
@@ -370 +384 @@
         return;
     this[name].targetUnits = this[name].targetUnits.concat(validEnts);
     var modifications = this.GetModifications(name);
     var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
     for each (let mod in modifications)
-        cmpAuraManager.ApplyBonus(mod.value, validEnts, mod, this.templateName + "/" + name + "/" + mod.value);
+        cmpAuraManager.ApplyBonus(mod.value, validEnts, mod, this.GetModifierIdentifier(name, mod));
     // update status bars if this has an icon
     if (!this.GetOverlayIcon(name))
         return;
     for (let ent of validEnts)
     {
@@ -391 +405 @@
         return;
     this[name].targetUnits = this[name].targetUnits.filter(v => validEnts.indexOf(v) == -1);
     var modifications = this.GetModifications(name);
     var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
     for each (let mod in modifications)
-        cmpAuraManager.RemoveBonus(mod.value, validEnts, this.templateName + "/" + name + "/" + mod.value);
+        cmpAuraManager.RemoveBonus(mod.value, validEnts, this.GetModifierIdentifier(name, mod));
     // update status bars if this has an icon
     if (!this.GetOverlayIcon(name))
         return;
     for (let ent of validEnts)
     {