Ticket #2342: patch_alert_autogarrison.patch

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

@@ -34 +34 @@
     PlaySound(alertString, this.entity);
 };
 
-AlertRaiser.prototype.IncreaseAlertLevel = function()
+AlertRaiser.prototype.UpdateUnits = function()
 {
-    if(!this.CanIncreaseLevel())
-        return false;
-    
     // Find units owned by this unit's player
     var players = [];
     var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
     if (cmpOwnership)
         players = [cmpOwnership.GetOwner()];
-        
-    this.level++;
-    this.SoundAlert();
     
     // Select units to put under alert, ignoring domestic animals (NB : war dogs are not domestic)
     var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
@@ -62 +56 @@
         cmpUnitAI.ReplaceOrder("Alert", {"raiser": this.entity, "force": true});
         this.walkingUnits.push(unit);
     }
+}
+
+AlertRaiser.prototype.IncreaseAlertLevel = function()
+{
+    if(!this.CanIncreaseLevel())
+        return false;
+        
+    this.level++;
+    this.SoundAlert();
     
+    this.UpdateUnits();
+    
     return true;
 };
 
@@ -72 +77 @@
     
     var index = this.walkingUnits.indexOf(msg.unit);
     if (index != -1)
-        this.walkingUnits.splice(index, 1);
-    
+        this.walkingUnits.splice(index, 1); 
 }
 
+AlertRaiser.prototype.OnGlobalTrainingFinished = function(msg)
+{
+    this.UpdateUnits();
+}
+
 AlertRaiser.prototype.EndOfAlert = function()
 {
     this.level = 0;

binaries/data/mods/public/simulation/components/interfaces/ProductionQueue.js

@@ -7 +7 @@
 // Message of the form { entities: [id, ...], metadata: ... }
 // sent to the current entity whenever a unit has been trained.
 Engine.RegisterMessageType("TrainingFinished");
+
+// Message of the form { } broadcasted whenever a unit has been trained.
+Engine.RegisterMessageType("GlobalTrainingFinished");

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

@@ -592 +592 @@
             "owner": cmpOwnership.GetOwner(),
             "metadata": metadata,
         });
+        
+        Engine.BroadcastMessage(MT_GlobalTrainingFinished, {});
     }
     
     return createdEnts.length;