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

@@ -3829 +3829 @@
     // 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, 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")
     {
@@ -3836 +3837 @@
         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" && type != "Walk")
     {
         var order = { "type": type, "data": data };
         var packingOrder = this.orderQueue.shift();
         this.orderQueue = [packingOrder, order];
     }
+    else if (this.IsPacking() && type == "Walk")
+    {
+        this.orderQueue = [];
+        this.PushOrder("CancelUnpack", { "force": true });
+        this.PushOrder(type, data);
+    }
     else
     {
         this.orderQueue = [];