Ticket #2984: garrison.diff

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

@@ -296 +296 @@
  */
 GarrisonHolder.prototype.Eject = function(entity, forced)
 {
-
     var entityIndex = this.entities.indexOf(entity);
     // Error: invalid entity ID, usually it's already been ejected
     if (entityIndex == -1)
@@ -632 +631 @@
         this.Eject(msg.entity);
         this.Garrison(msg.newentity);
     }
+
+    if (!this.initGarrison)
+        return;
+
+    // update the pre-game garrison because of SkirmishReplacement
+    if (msg.entity == this.entity)
+    {
+        let cmpGarrisonHolder = Engine.QueryInterface(msg.newentity, IID_GarrisonHolder);
+        if (cmpGarrisonHolder)
+            cmpGarrisonHolder.initGarrison = this.initGarrison;
+    }
+    else
+    {
+        let entityIndex = this.initGarrison.indexOf(msg.entity);
+        if (entityIndex != -1)
+            this.initGarrison[entityIndex] = msg.newentity;
+    }
 };
 
 
@@ -697 +713 @@
     return false;
 };
 
+/**
+ * Initialise the garrisoned units
+ */
+GarrisonHolder.prototype.OnGlobalInitGame = function(msg)
+{
+    if (!this.initGarrison)
+        return;
+
+    for (let ent of this.initGarrison)
+    {
+        var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+        if (!cmpUnitAI || !cmpUnitAI.CanGarrison(this.entity))
+            continue;
+        this.Garrison(ent);
+    }
+    this.initGarrison = undefined;
+};
+
 Engine.RegisterComponentType(IID_GarrisonHolder, "GarrisonHolder", GarrisonHolder);
 

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

@@ -7 +7 @@
 // Message of the form { "holder": this.entity, "unit" : unit } sent to the AlertRaiser
 // which ordered the unit "unit" to garrison.
 Engine.RegisterMessageType("UnitGarrisonedAfterAlert");
+
+// Message sent by InitGame for component map-dependent initialization
+Engine.RegisterMessageType("InitGame");

binaries/data/mods/public/simulation/helpers/InitGame.js

@@ -18 +18 @@
 
 function InitGame(settings)
 {
+    // Map dependent initialisations of components (i.e. garrisoned units)
+    Engine.BroadcastMessage(MT_InitGame, {});
+
     // No settings when loading a map in Atlas, so do nothing
     if (!settings)
         return;

binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_ship_trireme">
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <SkirmishReplacer>
+    <general>units/{civ}_ship_trireme</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/athenians/trireme.xml</Actor>
+  </VisualActor>
+</Entity>