Ticket #1226: 0001-Hotkeys-for-training-units-out-of-selected-buildings.patch

binaries/data/config/default.cfg

@@ -178 +178 @@
 hotkey.selection.group.save.9 = "Ctrl+9"
 hotkey.selection.group.add.9 = "Shift+9"
 
+
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
@@ -189 +190 @@
 hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
 hotkey.timewarp.fastforward = Space         ; If timewarp mode enabled, speed up the game
 hotkey.timewarp.rewind = Backspace          ; If timewarp mode enabled, go back to earlier point in the game
+hotkey.session.queueunit.1 = "Z"            ; add first unit type to queue
+hotkey.session.queueunit.2 = "X"            ; add second unit type to queue
+hotkey.session.queueunit.3 = "C"            ; add third unit type to queue
+hotkey.session.queueunit.4 = "V"            ; add fourth unit type to queue
 
 ; > OVERLAY KEYS
 hotkey.fps.toggle = "Alt+F"                  ; Toggle frame counter
@@ -200 +205 @@
 ; > HOTKEYS ONLY
 hotkey.chat = Return                        ; Toggle chat window
 
+
 ; > GUI TEXTBOX HOTKEYS
 hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
 hotkey.text.delete.right = "Ctrl+Del"         ; Delete word to the right of cursor

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

@@ -1174 +1174 @@
     Engine.PostNetworkCommand({"type": "train", "entity": batchTrainingEntity, "template": batchTrainingType, "count": batchTrainingCount});
 }
 
+// Add the position leftmost unit to the training queue of the selected building
+function addQueueUnit(entity, position)
+{
+    if (entity)
+    {
+        entState = GetEntityState(entity);
+        if (entState && entState.training && entState.training.entities)
+        {
+            // it is a building that can produce units
+            if (position < entState.training.entities.length)
+            {
+                addToTrainingQueue(entState.id, entState.training.entities[position]);
+            }
+        }
+    }
+}
+
+function addQueueAll(position)
+{
+    var selection = g_Selection.toList();
+
+    if (!selection.length)
+        return;
+
+    selection.forEach(function(entity) {
+        addQueueUnit(entity, position);
+    });
+}
+
 // Called by GUI when user clicks training button
 function addToTrainingQueue(entity, trainEntType)
 {

binaries/data/mods/public/gui/session/session.xml

@@ -78 +78 @@
             <action on="Press">setCameraFollow(g_Selection.toList()[0]);</action>
         </object>
 
+        <!-- queue first unit in the training queue  -->
+        <object hotkey="session.queueunit.1">
+            <action on="Press">addQueueAll(0);</action>
+        </object>
+
+        <!-- queue 2nd unit in the training queue  -->
+        <object hotkey="session.queueunit.2">
+            <action on="Press">addQueueAll(1);</action>
+        </object>
+
+        <!-- queue 3rd unit in the training queue  -->
+        <object hotkey="session.queueunit.3">
+            <action on="Press">addQueueAll(2);</action>
+        </object>
+
+        <!-- queue 4th unit in the training queue  -->
+        <object hotkey="session.queueunit.4">
+            <action on="Press">addQueueAll(3);</action>
+        </object>
+
         <!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
         <object hotkey="selection.idlewarrior">
             <action on="Press">findIdleUnit(["Hero", "Champion", "CitizenSoldier", "Siege", "Warship"]);</action>

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

@@ -256 +256 @@
                 if (template.speed)
                     tooltip += "\n" + getEntitySpeed(template);
 
-                tooltip += "\n\n[font=\"serif-bold-13\"]Shift-click[/font][font=\"serif-13\"] to train " + trainNum + ".[/font]";
+                if (i >= 0 && i < 4)
+                {
+                    var train_hotkeys = ["Z", "X", "C", "V"];
+                    tooltip += "\n\n[font=\"serif-bold-13\"]HotKey (" + train_hotkeys[i] + ").[/font]";
+                } else {
+                    tooltip += "\n";
+                }
 
+                tooltip += "\n[font=\"serif-bold-13\"]Shift-click[/font][font=\"serif-13\"] to train " + trainNum + ".[/font]";
                 break;
 
             case CONSTRUCTION: