Ticket #3792: 3792.3.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()
@@ -81 +86 @@
     }
 };
 
 Auras.prototype.GetModifierIdentifier = function(name, mod)
 {
-        return this.templateName + "/" + name + "/" + mod.value;
+        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 = {};