Ticket #4008: missingunitactionhotkeys_v2.3.patch

binaries/data/config/default.cfg

@@ -181 +181 @@
 [hotkey.camera]
 reset = "R"                                   ; Reset camera rotation to default.
 follow = "F"                                  ; Follow the first unit in the selection
+rallypointfocus = unused                      ; Focus the camera on the rally point of the selected building
 zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
 zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
 zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
@@ -284 +285 @@
 garrison = Ctrl              ; Modifier to garrison when clicking on building
 autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
 guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
+repair = "J"                 ; Modifier to repair when clicking on building/mechanical unit
+unload = "U"                 ; Modifier to unload when building/mechanical unit is selected
 queue = Shift                ; Modifier to queue unit orders instead of replacing
 batchtrain = Shift           ; Modifier to train units in batches
 massbarter = Shift           ; Modifier to barter bunch of resources

binaries/data/mods/public/gui/common/color.js

@@ -134 +134 @@
 {
     let key = Engine.ConfigDB_GetValue("user", "hotkey." + hotkey);
 
-    if (!key)
+    if (!key || key.toLowerCase() == "unused")
         return "";
 
     return sprintf(text, {

binaries/data/mods/public/gui/manual/intro.txt

@@ -70 +70 @@
 . (Period): Select idle worker (including citizen soldiers)
 Shift + .: add idle worker to selection (including citizen soldiers)
 H: Stop (halt) the currently selected units.
+U: Unload the garrisoned units of the selected buildings
 Ctrl + 1 (and so on up to Ctrl + 0): Create control group 1 (to 0) from the selected units/buildings
 1 (and so on up to 0): Select the units/buildings in control group 1 (to 0)
 Shift + 1 (to 0): Add control group 1 (to 0) to the selected units/buildings
@@ -82 +83 @@
 
 [font="sans-bold-14"]Modify mouse action
 [font="sans-14"]Ctrl + Right Click on building: Garrison
+J + Right Click on building: Repair
 Shift + Right Click: Queue the move/build/gather/etc order
 Shift + Left click when training unit/s: Add units in batches of five
 Shift + Left Click or Left Drag over unit on map: Add unit to selection

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

@@ -5 +5 @@
         <action on="Press">setCameraFollow(g_Selection.getFirstSelected());</action>
     </object>
 
+    <object hotkey="camera.rallypointfocus">
+        <action on="Press">performCommand(g_Selection.getFirstSelected(), "focus-rally");</action>
+    </object>
+
     <!-- Camera jumping - press a hotkey to mark a position and another hotkey to jump back there -->
     <object hotkey="camera.jump.1">
         <action on="Press">jumpCamera(1);</action>

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

@@ -46 +46 @@
         <action on="Press">performCommand(g_Selection.getFirstSelected(), "delete");</action>
     </object>
 
+    <object hotkey="session.unload">
+        <action on="Press">unloadAll();</action>
+    </object>
+
     <object hotkey="session.stop">
         <action on="Press">stopUnits(g_Selection.toList());</action>
     </object>

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

@@ -344 +344 @@
                 "target": null
             };
         },
+        "hotkeyActionCheck": function(target)
+        {
+            if (!Engine.HotkeyIsPressed("session.repair") ||
+                !getActionInfo("repair", target).possible)
+                return false;
+
+            return {
+                "type": "build",
+                "cursor": "action-repair",
+                "target": target
+            };
+        },
         "actionCheck": function(target)
         {
             if (!getActionInfo("repair", target).possible)
@@ -783 +795 @@
                 cursor = "action-attack-move";
             }
 
-            if (targetState.garrisonHolder &&
+            if (Engine.HotkeyIsPressed("session.repair") && targetState.needsRepair &&
+                playerCheck(entState, targetState, ["Ally"]))
+            {
+                data.command = "repair";
+                data.target = targetState.id;
+                cursor = "action-repair";
+            }
+            else if (targetState.garrisonHolder &&
                 playerCheck(entState, targetState, ["Player", "MutualAlly"]))
             {
                 data.command = "garrison";
@@ -973 +992 @@
             }
 
             return {
-                "tooltip": translate("Unload All"),
+                "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.unload") +
+                           translate("Unload All."),
                 "icon": "garrison-out.png",
                 "count": count,
             };
@@ -1088 +1108 @@
                 return false;
 
             return {
-                "tooltip": translate("Repair"),
+                "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.repair") +
+                           translate("Order the selected units to repair a building or mechanical unit."),
                 "icon": "repair.png"
             };
         },
@@ -1106 +1127 @@
                 return false;
 
             return {
-                "tooltip": translate("Focus on Rally Point"),
+                "tooltip": colorizeHotkey("%(hotkey)s" + " ", "camera.rallypointfocus") +
+                           translate("Focus on Rally Point."),
                 "icon": "focus-rally.png"
             };
         },
@@ -1252 +1274 @@
             }
 
             return {
-                "tooltip": translate("Unload All"),
+                "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.unload") +
+                           translate("Unload All."),
                 "icon": "garrison-out.png",
                 "count": count,
             };