Ticket #1870: stop-hotkey.2.patch

binaries/data/config/default.cfg

@@ -171 +171 @@
 hotkey.showsky = "Alt+Z"                    ; Toggle sky
 
 ; > CAMERA SETTINGS
-hotkey.camera.reset = "H"                                   ; Reset camera rotation to default.
+hotkey.camera.reset = "R"                                   ; Reset camera rotation to default.
 hotkey.camera.follow = "F"                                  ; Follow the first unit in the selection
 hotkey.camera.zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
 hotkey.camera.zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
@@ -243 +243 @@
 
 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
+hotkey.session.stop = "H"                   ; Stop the current action
 hotkey.session.attack = AltGr               ; Modifier to force attack instead of another action
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
 hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point

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

@@ -97 +97 @@
         <action on="Press">setCameraFollow(g_Selection.toList()[0]);</action>
     </object>
     
+    <!-- Stop the selected units -->
+    <object hotkey="session.stop">
+        <action on="Press">stopUnits(g_Selection.toList());</action>
+    </object>
+    
     <!-- queue first unit in the training queue  -->
     <object hotkey="session.queueunit.1">
         <action on="Press">addTrainingByPosition(0);</action>

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

@@ -62 +62 @@
 Delete: Delete currently selected unit/units/building/buildings
 ,: Select idle fighters
 .: Select idle workers (including citizen soldiers)
+H: Stop (halt) the currently selected units.
 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 selected units/buildings to control group 1 (to 0)
@@ -101 +102 @@
 Shift + Mouse Wheel Rotate Up: Rotate camera clockwise around terrain
 Shift + Mouse Wheel Rotate Down: Rotate camera anticlockwise around terrain
 F: Follow the selected unit (move the camera to stop the camera from following the unit/s)
-H: Reset camera zoom/orientation
+R: Reset camera zoom/orientation
 +: Zoom in (keep pressed for continuous zoom)
 -: Zoom out (keep pressed for continuous zoom)
 Alt+W: Toggle through wireframe modes