Ticket #1206: #1206-2012-03-21.patch

binaries/data/config/default.cfg

@@ -184 +184 @@
 hotkey.session.queue = Shift                ; Modifier to queue unit orders instead of replacing
 hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
 hotkey.session.massbarter = Shift           ; Modifier to barter bunch of resources
+hotkey.session.unloadtype = Shift           ; Modifier to unload all units of type
 hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
 hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
 hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise

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

@@ -1403 +1403 @@
     resetIdleUnit();
 }
 
-function unload(garrisonHolder, entity)
+function unload(garrisonHolder, entities)
 {
-    Engine.PostNetworkCommand({"type": "unload", "entity": entity, "garrisonHolder": garrisonHolder});
+    if (Engine.HotkeyIsPressed("session.unloadtype"))
+        Engine.PostNetworkCommand({"type": "unload", "entities": entities, "garrisonHolder": garrisonHolder});
+    else
+        Engine.PostNetworkCommand({"type": "unload", "entities": [entities[0]], "garrisonHolder": garrisonHolder});
 }
 
 function unloadAll(garrisonHolder)

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

@@ -226 +226 @@
 
             case GARRISON:
                 var name = getEntityName(template);
-                var tooltip = "Unload " + getEntityName(template);
+                var tooltip = "Unload " + getEntityName(template) + "\nSingle-click to unload 1. Shift-click to unload all of this type.";
                 var count = garrisonGroups.getCount(item);
                 getGUIObjectByName("unit"+guiName+"Count["+i+"]").caption = (count > 1 ? count : "");
                 break;
@@ -508 +508 @@
             var groups = new EntityGroups();
             groups.add(entState.garrisonHolder.entities);
             setupUnitPanel("Garrison", usedPanels, entState, groups.getTemplateNames(),
-                function (item) { unload(entState.id, groups.getEntsByName(item)[0]); } );
+                function (item) { unload(entState.id, groups.getEntsByName(item)); } );
         }
 
         var formations = getEntityFormationsList(entState);

binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -424 +424 @@
         if (!this._template.GarrisonHolder) 
             return;
         
-        Engine.PostCommand({"type": "unload", "garrisonHolder": this.id(), "entity": unit.id()}); 
+        Engine.PostCommand({"type": "unload", "garrisonHolder": this.id(), "entities": [unit.id()]}); 
     }, 
 
     unloadAll: function() {

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

@@ -337 +337 @@
         if (CanControlUnit(cmd.garrisonHolder, player, controlAllUnits))
         {
             var cmpGarrisonHolder = Engine.QueryInterface(cmd.garrisonHolder, IID_GarrisonHolder);
-            if (!cmpGarrisonHolder || !cmpGarrisonHolder.Unload(cmd.entity))
+            var notUngarrisoned = 0;
+            for each (ent in cmd.entities)
+            {
+                if (!cmpGarrisonHolder || !cmpGarrisonHolder.Unload(ent))
+                {
+                    notUngarrisoned++;
+                }
+            }
+            if (notUngarrisoned != 0)
             {
                 var cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
-                var notification = {"player": cmpPlayer.GetPlayerID(), "message": "Unable to ungarrison unit"};
+                var notification = {"player": cmpPlayer.GetPlayerID(), "message": (notUngarrisoned == 1 ? "Unable to ungarrison unit" : "Unable to ungarrison units")};
                 var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
                 cmpGUIInterface.PushNotification(notification);
-            }   
+            }
         }
         else if (g_DebugCommands)
         {