Ticket #2353: work_orders_under_alert.3.patch

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

@@ -247 +247 @@
     Engine.PostMessage(this.entity, MT_GarrisonedUnitsChanged, { "added" : [entity], "removed": [] });
     
     var cmpUnitAI = Engine.QueryInterface(entity, IID_UnitAI);
-    if (cmpUnitAI && cmpUnitAI.GetAlertRaiser())
+    if (cmpUnitAI && cmpUnitAI.IsUnderAlert())
         Engine.PostMessage(cmpUnitAI.GetAlertRaiser(), MT_UnitGarrisonedAfterAlert, {"holder": this.entity, "unit": entity});
     
     return true;

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

@@ -3067 +3067 @@
 
 UnitAI.prototype.IsUnderAlert = function()
 {
-    return this.alertGarrisoningTarget != undefined;
+    return this.alertRaiser != undefined;
 };
 
 UnitAI.prototype.ResetAlert = function()
 {
     this.alertGarrisoningTarget = undefined;
+    this.alertRaiser = undefined;
 };
 
+UnitAI.prototype.GetAlertRaiser = function()
+{
+    return this.alertRaiser;
+};
+
 UnitAI.prototype.IsFormationController = function()
 {
     return (this.template.FormationController == "true");
@@ -3570 +3576 @@
 
 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 = [];
@@ -3656 +3666 @@
     this.workOrders = orders;
 };
 
-UnitAI.prototype.GetAlertRaiser = function()
-{
-    return this.alertRaiser;
-};
-
 UnitAI.prototype.TimerHandler = function(data, lateness)
 {
     // Reset the timer