Ticket #3589: UnitAI.patch

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

@@ -844 +844 @@
         "Order.Attack": function(msg) {
             var target = msg.data.target;
             var allowCapture = msg.data.allowCapture;
+            var attackType = msg.data.attackType;
+            
             var cmpTargetUnitAI = Engine.QueryInterface(target, IID_UnitAI);
             if (cmpTargetUnitAI && cmpTargetUnitAI.IsFormationMember())
                 target = cmpTargetUnitAI.GetFormationController();
 
             var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
             // Check if we are already in range, otherwise walk there
-            if (!this.CheckTargetAttackRange(target, target))
+            if (!this.CheckTargetAttackRange(target, attackType))
             {
                 if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
                 {
-                    if (this.MoveToTargetAttackRange(target, target))
+                    if (this.MoveToTargetAttackRange(target, attackType))
                     {
                         this.SetNextState("COMBAT.APPROACHING");
                         return;
@@ -1168 +1170 @@
                 "enter": function(msg) {
                     var target = this.order.data.target;
                     var allowCapture = this.order.data.allowCapture;
+                    var attackType = this.order.data.attackType;
                     // Check if we are already in range, otherwise walk there
-                    if (!this.CheckTargetAttackRange(target, target))
+                    if (!this.CheckTargetAttackRange(target, attackType))
                     {
                         if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
                         {
@@ -1192 +1195 @@
                 "Timer": function(msg) {
                     var target = this.order.data.target;
                     var allowCapture = this.order.data.allowCapture;
+                    var attackType = this.order.data.attackType;
                     // Check if we are already in range, otherwise walk there
-                    if (!this.CheckTargetAttackRange(target, target))
+                    if (!this.CheckTargetAttackRange(target, attackType))
                     {
                         if (this.TargetIsAlive(target) && this.CheckTargetVisible(target))
                         {