Ticket #4015: change4015.3.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": "Offensive ePeen", "name": "Jared Ryan Bills"},
+            {"nick": "odoaker", "name": "Agoston Sipos"},
+            {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"},
             {"nick": "Ols", "name": "Oliver Whiteman"},
             {"nick": "olsner", "name": "Simon Brenner"},
             {"nick": "otero"},

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

@@ -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);
@@ -3831 +3831 @@
         else
             this.UpdateWorkOrders(type);
     }
+    var 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 +3839 @@
     // 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))
+        {
+            if (this.GetCurrentState().split(".").pop() == "PACKING")
+            {
+                this.orderQueue = [order];
+                this.PushOrderFront("CancelPack", { "force": true });
+            }
+            else
+                this.orderQueue = [this.orderQueue.shift(), order];
+        }
+        else
+        {
+            if (this.GetCurrentState().split(".").pop() == "UNPACKING")
+            {
+                this.orderQueue = [order];
+                this.PushOrderFront("CancelUnpack", { "force": true });
+            }
+            else
+                this.orderQueue = [this.orderQueue.shift(), order];
+        }
     }
     else
     {
@@ -5960 +5977 @@
     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()