Ticket #995: ticket995_trampling_3.diff

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

@@ -37 +37 @@
                     "</choice>" +
                 "</element>" +
                 modificationSchema +
+                "<optional>" +  
+                    "<element name='ActionMultiplier' a:help='Multipliers for actions'>" +
+                        "<oneOrMore>" +
+                            "<element a:help='Name of the action in CAPS'>" +
+                                "<anyName/><data type='decimal'/>" +
+                            "</element>" +
+                        "</oneOrMore>" +                        
+                    "</element>" +
+                "</optional>"  +
                 "<optional>" +
                     "<element name='AuraName' a:help='name to display in the GUI'>" +
                         "<text/>" +
@@ -78 +87 @@
         aura.affects = this.template[name].Affects;
         if (this.template[name].AffectedPlayers)
             aura.affectedPlayers = this.template[name].AffectedPlayers.split(/\s+/);
+        if (this.template[name].ActionMultiplier)
+            aura.actionMultiplier = this.template[name].ActionMultiplier
         aura.modifications = [];
-        for (var value in this.template[name].Modifications)
+        for (let value in this.template[name].Modifications)
         {
             var mod = {};
             mod.value = value.replace(/\./g, "/").replace(/\/\//g, ".");
             if (this.template[name].Modifications[value].Add)
                 mod.add = +this.template[name].Modifications[value].Add;
-            else if (this.template[name].Modifications[value].Multiply)
+            if (this.template[name].Modifications[value].Multiply)
                 mod.multiply = +this.template[name].Modifications[value].Multiply;
             aura.modifications.push(mod);
         }
@@ -170 +181 @@
     }
 };
 
+Auras.prototype.GetActionMultiplier = function(name)
+{
+    let cmpUnitAI = Engine.QueryInterface(this.entity, IID_UnitAI);
+    if (!cmpUnitAI || !this.auras[name].actionMultiplier)
+        return 1.0;
+
+    let action = cmpUnitAI.GetCurrentState().split(".").pop();
+    if (this.auras[name].actionMultiplier[action])
+        return this.auras[name].actionMultiplier[action];
+    return 1.0;
+};
+
 Auras.prototype.HasFormationAura = function()
 {
     return this.GetAuraNames().some(n => this.IsFormationAura(n));
@@ -216 +239 @@
     return this.GetType(name) == "global";
 };
 
+Auras.prototype.HasActionMultiplier = function()
+{
+    return this.GetAuraNames().some(n => !this.IsActionMultiplier(n));
+};
+
+Auras.prototype.IsActionMultiplier = function(name)
+{
+    return !this.auras[name].actionMultiplier;
+};
+
 /**
  * clean all bonuses. Remove the old ones and re-apply the new ones
  */
@@ -365 +398 @@
 
 Auras.prototype.ApplyBonus = function(name, ents)
 {
-    var validEnts = this.GiveMembersWithValidClass(name, ents);
+    let validEnts = this.GiveMembersWithValidClass(name, ents);
     if (!validEnts.length)
         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);
-    // update status bars if this has an icon
-    if (!this.GetOverlayIcon(name))
+    let modifications = this.GetModifications(name);
+    let cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
+    let modNumber = 0;
+    for (let mod in modifications)
+    {
+        let data = {};
+        if (modifications[mod].add)
+            data.add = modifications[mod].add * this.GetActionMultiplier(name);
+        if (modifications[mod].multiply)
+            data.multiply = modifications[mod].multiply * this.GetActionMultiplier(name);
+        if ((!modifications[mod].add || data.add == 0) && (!modifications[mod].multiply || data.multiply == 1))
+            continue;
+        cmpAuraManager.ApplyBonus(modifications[mod].value, validEnts, data, this.templateName + "/" + name + "/" + modifications[mod].value);
+        modNumber++;
+    };
+
+    // update status bars if this has an icon and a bonus is applied
+    if (!this.GetOverlayIcon(name) || modNumber == 0)
         return;
     for (let ent of validEnts)
     {
-        var cmpStatusBars = Engine.QueryInterface(ent, IID_StatusBars);
+        let cmpStatusBars = Engine.QueryInterface(ent, IID_StatusBars);
         if (cmpStatusBars)
             cmpStatusBars.AddAuraSource(this.entity, name);
     }

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

@@ -72 +72 @@
 
 StatusBars.prototype.RemoveAuraSource = function(source, auraName)
 {
+    if (!this.auraSources[source])
+        return;
     let names = this.auraSources[source];
     names.splice(names.indexOf(auraName), 1);
     this.RegenerateSprites();

binaries/data/mods/public/simulation/helpers/FSM.js

@@ -383 +383 @@
 
     obj.fsmStateName = nextStateName;
     obj.FsmStateNameChanged(obj.fsmStateName);
+
+    let cmpAuras = Engine.QueryInterface(obj.entity, IID_Auras);
+    if (cmpAuras && cmpAuras.HasActionMultiplier())
+        cmpAuras.Clean();
 };
 
 Engine.RegisterGlobal("FSM", FSM);

binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml

@@ -19 +19 @@
       <wood>100</wood>
     </Resources>
   </Cost>
+  <Auras>
+    <Aura1>
+      <Type>range</Type>
+      <Radius>100</Radius>
+      <Affects>Human</Affects>
+      <AffectedPlayers>Enemy</AffectedPlayers>
+      <Modifications>
+        <Health.RegenRate> <Add>-1</Add> </Health.RegenRate>
+      </Modifications>
+      <ActionMultiplier>
+    <IDLE>0</IDLE>
+        <WALKING>2.0</WALKING>
+        <APPROACHING>2.0</APPROACHING>
+      </ActionMultiplier>
+      <AuraName>Trample</AuraName>
+      <AuraDescription>Tramples all nearby enemy's</AuraDescription>
+      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
+    </Aura1>
+  </Auras>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer.</GenericName>