Ticket #4015: UnitAI.js.2.patch

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

@@ -3835 +3835 @@
     // Special cases of orders that shouldn't be replaced:
     // 1. Cheering - we're invulnerable, add order after we finish
     // 2. Packing/unpacking - we're immobile, add order after we finish (unless it's cancel)
+    // 2./1. If order is a move (or out of range attack), we cancel packing immediately and then add the moving order
     // TODO: maybe a better way of doing this would be to use priority levels
     if (this.order && this.order.type == "Cheering")
     {
@@ -3842 +3843 @@
         var cheeringOrder = this.orderQueue.shift();
         this.orderQueue = [cheeringOrder, order];
     }
-    else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack")
+    else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack" && this.ShouldPack(type, data))
     {
         var order = { "type": type, "data": data };
         var packingOrder = this.orderQueue.shift();
         this.orderQueue = [packingOrder, order];
     }
+    else if (this.IsPacking() && !this.ShouldPack(type, data))
+    {
+        this.orderQueue = [];
+        this.PushOrder("CancelUnpack", { "force": true });
+        this.PushOrder(type, data);
+    }
     else
     {
         this.orderQueue = [];
@@ -5960 +5967 @@
     return (cmpPack && cmpPack.IsPacking());
 };
 
+UnitAI.prototype.ShouldPack = function(type, data)
+{
+    return type == "Attack" && this.CheckTargetAttackRange(data.target, this.GetBestAttackAgainst(data.target, false));
+};
+
 //// Formation specific functions ////
 
 UnitAI.prototype.IsAttackingAsFormation = function()