Ticket #2353: work_orders_under_alert.2.patch

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

@@ -698 +698 @@
 
     "Order.Alert": function(msg) {
         this.alertRaiser = this.order.data.raiser;
+        this.isUnderAlert = true;
         
         // Find a target to garrison into, if we don't already have one
         if (!this.alertGarrisoningTarget)
@@ -3050 +3051 @@
     this.isGuardOf = undefined;
 
     // "Town Bell" behaviour
+    this.isUnderAlert = false;
     this.alertRaiser = undefined;
     this.alertGarrisoningTarget = undefined;
 
@@ -3067 +3069 @@
 
 UnitAI.prototype.IsUnderAlert = function()
 {
-    return this.alertGarrisoningTarget != undefined;
+    return this.isUnderAlert;
 };
 
 UnitAI.prototype.ResetAlert = function()
 {
     this.alertGarrisoningTarget = undefined;
+    this.isUnderAlert = false;
 };
 
 UnitAI.prototype.IsFormationController = function()
@@ -3570 +3573 @@
 
 UnitAI.prototype.UpdateWorkOrders = function(type)
 {
+    // Under alert, remembered work orders won't be forgotten
+    if (this.IsUnderAlert())
+        return;
+    
     var isWorkType = function(type){
         return (type == "Gather" || type == "Trade" || type == "Repair" || type == "ReturnResource");
     };
     
-    // If we are being reaffected to a work order, forgot the previous ones
+    // If we are being re-affected to a work order, forget the previous ones
     if (isWorkType(type))
     {
         this.workOrders = [];