Ticket #2905: wallGarrison.diff

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

@@ -242 +242 @@
         vgp.entity = entity;
         cmpPosition.SetTurretParent(this.entity, vgp.offset);
         visiblyGarrisoned = true;
+        var cmpUnitAI = Engine.QueryInterface(entity, IID_UnitAI);
+        if (cmpUnitAI)
+            cmpUnitAI.SetTurretStance();
         break;
     }
     if (!visiblyGarrisoned)
@@ -337 +340 @@
         if (vgp.entity != entity)
             continue;
         cmpNewPosition.SetTurretParent(INVALID_ENTITY, new Vector3D());
+        var cmpUnitAI = Engine.QueryInterface(entity, IID_UnitAI);
+        if (cmpUnitAI)
+            cmpUnitAI.ResetTurretStance();
         vgp.entity = null;
         break;
     }

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

@@ -5284 +5284 @@
     this.SetupRangeQueries();
 };
 
+UnitAI.prototype.SetTurretStance = function()
+{
+    this.previousStance = undefined;
+    if (this.GetStance().respondStandGround)
+        return;
+    for (let stance in g_Stances)
+    {
+        if (!g_Stances[stance].respondStandGround)
+            continue;
+        this.previousStance = this.GetStanceName();
+        this.SwitchToStance(stance);
+        return;
+    }
+};
+
+UnitAI.prototype.ResetTurretStance = function()
+{
+    if (!this.previousStance)
+        return;
+    this.SwitchToStance(this.previousStance);
+    this.previousStance = undefined;
+};
+
 /**
  * Resets losRangeQuery, and if there are some targets in range that we can
  * attack then we start attacking and this returns true; otherwise, returns false.
@@ -5468 +5491 @@
 
 UnitAI.prototype.GetPossibleStances = function()
 {
+    if (this.IsTurret())
+        return [];
     return Object.keys(g_Stances);
 };
 

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

@@ -548 +548 @@
         for each (var ent in data.entities)
         {
             var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-            if (cmpUnitAI)
+            if (cmpUnitAI && !cmpUnitAI.IsTurret())
                 cmpUnitAI.SwitchToStance(cmd.name);
         }
     },