Ticket #3412: ships.diff

binaries/data/mods/public/gui/session/unit_actions.js

@@ -367 +367 @@
         {
             if (!hasClass(entState, "Unit") || !targetState.garrisonHolder)
                 return false;
+            if (!entState.unitAI || !entState.unitAI.canGarrison)
+                return false;
             if (!playerCheck(entState, targetState, ["Player", "Ally"]))
                 return false;
             var tooltip = sprintf(translate("Current garrison: %(garrisoned)s/%(capacity)s"), {
@@ -749 +751 @@
      "garrison": {
         "getInfo": function(entState)
         {
-            if (!entState.unitAI || entState.turretParent)
+            if (!entState.unitAI || !entState.unitAI.canGarrison || entState.turretParent)
                 return false;
             return {
                 "tooltip": translate("Garrison"),

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

@@ -351 +351 @@
             "orders": cmpUnitAI.GetOrders(),
             "hasWorkOrders": cmpUnitAI.HasWorkOrders(),
             "canGuard": cmpUnitAI.CanGuard(),
+            "canGarrison": cmpUnitAI.CanGarrison(),
             "isGuarding": cmpUnitAI.IsGuardOf(),
             "possibleStances": cmpUnitAI.GetPossibleStances(),
             "isIdle":cmpUnitAI.IsIdle(),

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

@@ -5632 +5632 @@
     if (this.IsFormationController())
         return true;
 
-    var cmpGarrisonHolder = Engine.QueryInterface(target, IID_GarrisonHolder);
-    if (!cmpGarrisonHolder)
-        return false;
-
-    // Verify that the target is owned by this entity's player or a mutual ally of this player
-    var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
-    if (!cmpOwnership || !(IsOwnedByPlayer(cmpOwnership.GetOwner(), target) || IsOwnedByMutualAllyOfPlayer(cmpOwnership.GetOwner(), target)))
-        return false;
+    // Because this checks if the unit can garrision at all, it may not have a target any more
+    if (target) {
+        var cmpGarrisonHolder = Engine.QueryInterface(target, IID_GarrisonHolder);
+        if (!cmpGarrisonHolder)
+            return false;
+
+        // Verify that the target is owned by this entity's player or a mutual ally of this player
+        var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
+        if (!cmpOwnership || !(IsOwnedByPlayer(cmpOwnership.GetOwner(), target) || IsOwnedByMutualAllyOfPlayer(cmpOwnership.GetOwner(), target)))
+            return false;
+    }
 
     // Don't let animals garrison for now
     // (If we want to support that, we'll need to change Order.Garrison so it
@@ -5647 +5650 @@
     if (this.IsAnimal())
         return false;
 
+    // Don't let ships garrison
+    var isShip = Engine.QueryInterface(this.entity, IID_Identity).HasClass("Ship");
+    if (isShip)
+        return false;
+
     return true;
 };