Ticket #2342: patch_alert_autogarrison_alter.patch

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

@@ -11 +11 @@
     // Remember the units ordered to garrison
     this.garrisonedUnits = [];
     this.walkingUnits = [];
+    
+    // Remember production buildings under alert
+    this.prodBuildings = [];
 };
 
 AlertRaiser.prototype.GetLevel = function()
@@ -34 +37 @@
     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 +59 @@
         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();
     
+    // Find buildings owned by this unit's player
+    var players = [];
+    var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
+    if (cmpOwnership)
+        players = [cmpOwnership.GetOwner()];
+    
+    // Select production buildings to put "under alert", including the raiser itself if possible
+    var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var level = this.GetLevel();
+    var buildings = rangeMan.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_ProductionQueue);
+    var ownCmpProductionQueue = Engine.QueryInterface(this.entity, IID_ProductionQueue);
+    if (ownCmpProductionQueue)
+        buildings.push(this.entity);
+    
+    for each(var building in buildings)
+    {
+        var cmpProductionQueue = Engine.QueryInterface(building, IID_ProductionQueue);
+        cmpProductionQueue.PutUnderAlert(this.entity);
+        this.prodBuildings.push(building);
+    }
+    
+    // Put units under alert
+    this.UpdateUnits();
+    
     return true;
 };
 
@@ -72 +102 @@
     
     var index = this.walkingUnits.indexOf(msg.unit);
     if (index != -1)
-        this.walkingUnits.splice(index, 1);
-    
-}
+        this.walkingUnits.splice(index, 1); 
+};
 
 AlertRaiser.prototype.EndOfAlert = function()
 {
@@ -85 +114 @@
     for each(var unit in this.walkingUnits)
     {
         var cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
+        if(!cmpUnitAI)
+            continue;
         
         cmpUnitAI.ResetAlert();
             
@@ -100 +131 @@
     {
         var cmpGarrisonHolder = Engine.QueryInterface(slot.holder, IID_GarrisonHolder);
         var cmpUnitAI = Engine.QueryInterface(slot.unit, IID_UnitAI);
+        if(!cmpUnitAI)
+            continue;
         
         if(cmpGarrisonHolder && cmpGarrisonHolder.PerformEject([slot.unit], true))
         {
@@ -110 +143 @@
     }
     this.garrisonedUnits = [];
     
+    // Finally, reset production buildings state
+    for each(var building in this.prodBuildings)
+    {
+        var cmpProductionQueue = Engine.QueryInterface(building, IID_ProductionQueue);
+        if(!cmpProductionQueue)
+            continue;
+        
+        cmpProductionQueue.ResetAlert();
+    }
+    this.prodBuildings = [];
+    
     return true;
 };
 

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

@@ -65 +65 @@
 
     this.entityCache = [];
     this.spawnNotified = false;
+    
+    this.alertRaiser = undefined;
 };
 
+ProductionQueue.prototype.PutUnderAlert = function(raiser)
+{
+    this.alertRaiser = raiser;
+};
+
+ProductionQueue.prototype.ResetAlert = function()
+{
+    this.alertRaiser = undefined;
+};
+
 /*
  * Returns list of entities that can be trained by this building.
  */
@@ -592 +604 @@
             "owner": cmpOwnership.GetOwner(),
             "metadata": metadata,
         });
+        
+        if(this.alertRaiser)
+        {
+            var cmpAlertRaiser = Engine.QueryInterface(this.alertRaiser, IID_AlertRaiser);
+            if(cmpAlertRaiser)
+                cmpAlertRaiser.UpdateUnits();
+        }
     }
     
     return createdEnts.length;