Ticket #1915: garrisonCapacity-v3.diff

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

@@ -297 +297 @@
     {
         ret.garrisonHolder = {
             "entities": cmpGarrisonHolder.GetEntities(),
-            "allowedClasses": cmpGarrisonHolder.GetAllowedClassesList()
+            "allowedClasses": cmpGarrisonHolder.GetAllowedClassesList(),
+            "capacity": cmpGarrisonHolder.GetCapacity()
         };
     }
     

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

@@ -227 +227 @@
             data.command = "garrison";
             data.target = target;
             cursor = "action-garrison";
+            tooltip = "Current garrison: " + targetState.garrisonHolder.entities.length
+                + "/" + targetState.garrisonHolder.capacity;
+            if (targetState.garrisonHolder.entities.length >= targetState.garrisonHolder.capacity)
+                tooltip = "[color=\"orange\"]" + tooltip + "[/color]";
         }
         else if (targetState.resourceSupply)
         {
@@ -311 +315 @@
         case "garrison":
             if (hasClass(entState, "Unit") && targetState.garrisonHolder && (playerOwned || mutualAllyOwned))
             {
+                var tooltip = "Current garrison: " + targetState.garrisonHolder.entities.length
+                    + "/" + targetState.garrisonHolder.capacity;
+                if (targetState.garrisonHolder.entities.length >= targetState.garrisonHolder.capacity)
+                    tooltip = "[color=\"orange\"]" + tooltip + "[/color]";
                 var allowedClasses = targetState.garrisonHolder.allowedClasses;
                 for each (var unitClass in entState.identity.classes)
                 {
                     if (allowedClasses.indexOf(unitClass) != -1)
                     {
-                        return {"possible": true};
+                        return {"possible": true, "tooltip": tooltip};
                     }
                 }
             }
@@ -460 +468 @@
         target = targets[0];
     }
 
+    var actionInfo = undefined;
     if (preSelectedAction != ACTION_NONE)
     {
         switch (preSelectedAction)
         {
         case ACTION_GARRISON:
-            if (getActionInfo("garrison", target).possible)
-                return {"type": "garrison", "cursor": "action-garrison", "target": target};
+            if ((actionInfo = getActionInfo("garrison", target)).possible)
+                return {"type": "garrison", "cursor": "action-garrison", "tooltip": actionInfo.tooltip, "target": target};
             else
-                return  {"type": "none", "cursor": "action-garrison-disabled", "target": undefined};
+                return {"type": "none", "cursor": "action-garrison-disabled", "target": undefined};
             break;
         case ACTION_REPAIR:
             if (getActionInfo("repair", target).possible)
@@ -482 +491 @@
     {
         return {"type": "attack", "cursor": "action-attack", "target": target};
     }
-    else if (Engine.HotkeyIsPressed("session.garrison") && getActionInfo("garrison", target).possible)
+    else if (Engine.HotkeyIsPressed("session.garrison") && (actionInfo = getActionInfo("garrison", target)).possible)
     {
-        return {"type": "garrison", "cursor": "action-garrison", "target": target};
+        return {"type": "garrison", "cursor": "action-garrison", "tooltip": actionInfo.tooltip, "target": target};
     }
     else if (Engine.HotkeyIsPressed("session.attackmove") && getActionInfo("attack-move", target).possible)
     {
@@ -492 +501 @@
     }
     else
     {
-        var actionInfo = undefined;
         if ((actionInfo = getActionInfo("setup-trade-route", target)).possible)
             return {"type": "setup-trade-route", "cursor": "action-setup-trade-route", "tooltip": actionInfo.tooltip, "target": target};
         else if ((actionInfo = getActionInfo("gather", target)).possible)