Ticket #4015: change4015.5.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

@@ -1842 +1842 @@
                     {
                         // If the unit needs to unpack, do so
                         if (this.CanUnpack())
-                            this.SetNextState("UNPACKING");
+                            this.PushOrderFront("Unpack", { "force" : this.order.data.force });
                         else
                             this.SetNextState("ATTACKING");
                     }
@@ -3767 +3767 @@
         var cheeringOrder = this.orderQueue.shift();
         this.orderQueue.unshift(cheeringOrder, order);
     }
-    else if (this.order && this.IsPacking())
+    else if (this.order && this.IsPacking() && type != "CancelPack" && type != "CancelUnpack")
     {
-        var packingOrder = this.orderQueue.shift();
-        this.orderQueue.unshift(packingOrder, order);
+        if ((this.ShouldUnpack(type, data) || type == "Stop") && this.GetCurrentState().split(".").pop() == "PACKING")
+            this.orderQueue.unshift({ "type": "CancelPack", "data": { "force": data.force } }, order);
+        else if ((!this.ShouldUnpack(type, data) || type == "Stop") && this.GetCurrentState().split(".").pop() == "UNPACKING")
+            this.orderQueue.unshift({ "type": "CancelUnpack", "data": { "force": data.force } }, order);
+        else
+        {
+            var packingOrder = this.orderQueue.shift();
+            this.orderQueue.unshift(packingOrder, order);
+        }
     }
     else
     {
@@ -3831 +3838 @@
         else
             this.UpdateWorkOrders(type);
     }
+    let order = { "type": type, "data": data };
 
     // Special cases of orders that shouldn't be replaced:
     // 1. Cheering - we're invulnerable, add order after we finish
@@ -3838 +3846 @@
     // TODO: maybe a better way of doing this would be to use priority levels
     if (this.order && this.order.type == "Cheering")
     {
-        var order = { "type": type, "data": data };
         var cheeringOrder = this.orderQueue.shift();
         this.orderQueue = [cheeringOrder, order];
     }
     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) || type == "Stop") && this.GetCurrentState().split(".").pop() == "PACKING")
+        {
+            this.orderQueue = [order];
+            this.PushOrderFront("CancelPack", { "force": data.force });
+        }
+        else if ((!this.ShouldUnpack(type, data) || type == "Stop") && this.GetCurrentState().split(".").pop() == "UNPACKING")
+        {
+            this.orderQueue = [order];
+            this.PushOrderFront("CancelUnpack", { "force": data.force });
+        }
+        else
+            this.orderQueue = [this.orderQueue.shift(), order];
     }
     else
     {
@@ -5960 +5976 @@
     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()