Ticket #4008: missingunitactionhotkeys_v2.patch
File missingunitactionhotkeys_v2.patch, 5.2 KB (added by , 8 years ago) |
---|
-
binaries/data/config/default.cfg
181 181 [hotkey.camera] 182 182 reset = "R" ; Reset camera rotation to default. 183 183 follow = "F" ; Follow the first unit in the selection 184 rallypointfocus = "Y" ; Focus the camera on the rally point of the selected building 184 185 zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control) 185 186 zoom.out = Minus, NumMinus ; Zoom camera out (continuous control) 186 187 zoom.wheel.in = WheelUp ; Zoom camera in (stepped control) … … 284 285 garrison = Ctrl ; Modifier to garrison when clicking on building 285 286 autorallypoint = Ctrl ; Modifier to set the rally point on the building itself 286 287 guard = "G" ; Modifier to escort/guard when clicking on unit/building 288 repair = Alt ; Modifier to repair when clicking on building/mechanical unit 289 unload = "U" ; Modifier to unload when building/mechanical unit is selected 287 290 queue = Shift ; Modifier to queue unit orders instead of replacing 288 291 batchtrain = Shift ; Modifier to train units in batches 289 292 massbarter = Shift ; Modifier to barter bunch of resources -
binaries/data/mods/public/gui/session/hotkeys/camera.xml
5 5 <action on="Press">setCameraFollow(g_Selection.getFirstSelected());</action> 6 6 </object> 7 7 8 <!-- Focus camera on building rally point --> 9 <object hotkey="camera.rallypointfocus"> 10 <action on="Press">performCommand(g_Selection.getFirstSelected(), "focus-rally");</action> 11 </object> 12 8 13 <!-- Camera jumping - press a hotkey to mark a position and another hotkey to jump back there --> 9 14 <object hotkey="camera.jump.1"> 10 15 <action on="Press">jumpCamera(1);</action> -
binaries/data/mods/public/gui/session/hotkeys/misc.xml
48 48 <action on="Press">performCommand(g_Selection.getFirstSelected(), "delete");</action> 49 49 </object> 50 50 51 <!-- Unload units from building/mechanical unit --> 52 <object hotkey="session.unload"> 53 <action on="Press">unloadAll();</action> 54 </object> 55 51 56 <object hotkey="session.stop"> 52 57 <action on="Press">stopUnits(g_Selection.toList());</action> 53 58 </object> -
binaries/data/mods/public/gui/session/unit_actions.js
344 344 "target": null 345 345 }; 346 346 }, 347 "hotkeyActionCheck": function(target) 348 { 349 if (!Engine.HotkeyIsPressed("session.repair") || 350 !getActionInfo("repair", target).possible) 351 return false; 352 353 return { 354 "type": "build", 355 "cursor": "action-repair", 356 "target": target 357 }; 358 }, 347 359 "actionCheck": function(target) 348 360 { 349 361 if (!getActionInfo("repair", target).possible) … … 782 794 data.targetClasses = targetClasses; 783 795 cursor = "action-attack-move"; 784 796 } 797 else if (Engine.HotkeyIsPressed("session.repair") && targetState.needsRepair && 798 playerCheck(entState, targetState, ["Ally"])) 799 { 800 data.command = "repair"; 801 data.target = targetState.id; 802 cursor = "action-repair"; 803 } 785 804 786 if (targetState.garrisonHolder && 805 if (targetState.garrisonHolder && !Engine.HotkeyIsPressed("session.repair") && 787 806 playerCheck(entState, targetState, ["Player", "MutualAlly"])) 788 807 { 789 808 data.command = "garrison"; … … 973 992 } 974 993 975 994 return { 976 "tooltip": translate("Unload All"), 995 "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.unload") + 996 translate("Unload All."), 977 997 "icon": "garrison-out.png", 978 998 "count": count, 979 999 }; … … 1103 1123 return false; 1104 1124 1105 1125 return { 1106 "tooltip": translate("Repair"), 1126 "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.repair") + 1127 translate("Order the selected units to repair a building or mechanical unit."), 1107 1128 "icon": "repair.png" 1108 1129 }; 1109 1130 }, … … 1121 1142 return false; 1122 1143 1123 1144 return { 1124 "tooltip": translate("Focus on Rally Point"), 1145 "tooltip": colorizeHotkey("%(hotkey)s" + " ", "camera.rallypointfocus") + 1146 translate("Focus on Rally Point."), 1125 1147 "icon": "focus-rally.png" 1126 1148 }; 1127 1149 }, … … 1267 1289 } 1268 1290 1269 1291 return { 1270 "tooltip": translate("Unload All"), 1292 "tooltip": colorizeHotkey("%(hotkey)s" + " ", "session.unload") + 1293 translate("Unload All."), 1271 1294 "icon": "garrison-out.png", 1272 1295 "count": count, 1273 1296 };