Ticket #4015: change4015.2.patch

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -141 +141 @@
             {"nick": "njm"},
             {"nick": "NoMonkey", "name": "John Mena"},
             {"nick": "notpete", "name": "Rich Cross"},
+            {"nick": "odoaker", "name": "Agoston Sipos"}
             {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"},
             {"nick": "Ols", "name": "Oliver Whiteman"},
             {"nick": "olsner", "name": "Simon Brenner"},

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")
     {
@@ -3844 +3845 @@
     }
     else if (this.IsPacking() && type != "CancelPack" && type != "CancelUnpack")
     {
-        var order = { "type": type, "data": data };
-        var packingOrder = this.orderQueue.shift();
-        this.orderQueue = [packingOrder, order];
+        if(this.ShouldUnpack(type, data))
+        {
+            this.orderQueue = [];
+            this.PushOrder("CancelPack", { "force": true });
+        }
+        else
+        {
+            this.orderQueue = [];
+            this.PushOrder("CancelUnpack", { "force": true });
+        }
+        this.PushOrder(type, data);
     }
     else
     {
@@ -5960 +5969 @@
     return (cmpPack && cmpPack.IsPacking());
 };
 
+UnitAI.prototype.ShouldUnpack = function(type, data)
+{
+    return type == "Attack" && this.CheckTargetAttackRange(data.target, this.GetBestAttackAgainst(data.target, false));
+};
+
 //// Formation specific functions ////
 
 UnitAI.prototype.IsAttackingAsFormation = function()