diff --git a/OpenRA.Game/GameRules/Settings.cs b/OpenRA.Game/GameRules/Settings.cs index 64ca77cb25..b0a70f84e0 100644 --- a/OpenRA.Game/GameRules/Settings.cs +++ b/OpenRA.Game/GameRules/Settings.cs @@ -129,20 +129,20 @@ namespace OpenRA.GameRules public class KeySettings { - public string PauseKey = "f3"; - public string CycleBaseKey = "backspace"; public string ToLastEventKey = "space"; public string ToSelectionKey = "home"; - public string SellKey = "v"; - public string PowerDownKey = "b"; - public string RepairKey = "n"; + + public string PauseKey = "f9"; + public string SellKey = "f10"; + public string PowerDownKey = "f11"; + public string RepairKey = "f12"; public string AttackMoveKey = "a"; public string StopKey = "s"; - public string ScatterKey = "x"; - public string StanceCycleKey = "z"; + public string ScatterKey = "d"; public string DeployKey = "f"; + public string StanceCycleKey = "g"; public string CycleTabsKey = "tab"; } diff --git a/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs b/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs index 26192907f9..ecb58a2817 100755 --- a/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs +++ b/OpenRA.Mods.RA/Widgets/OrderButtonWidget.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA.Widgets public OrderButtonWidget() { GetImage = () => Enabled() ? Pressed() ? "pressed" : "normal" : "disabled"; - GetDescription = () => Description; + GetDescription = () => Key != null ? "{0} ({1})".F(Description, Key.ToUpper()) : Description; GetLongDesc = () => LongDesc; } diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index 805353b4a9..7bc3d4e754 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -68,7 +68,7 @@ Container@INGAME_ROOT: Y:0 Width:160 Height:25 - Text:Options + Text:Options (ESC) Font:Bold Key: escape Button@INGAME_DIPLOMACY_BUTTON: @@ -76,24 +76,27 @@ Container@INGAME_ROOT: Y:0 Width:160 Height:25 - Text:Diplomacy + Text:Diplomacy (F1) Font:Bold + Key: f1 Button@CHEATS_BUTTON: X:324 Y:0 Width:160 Height:25 - Text:Cheats + Text:Cheats (F2) Visible:false Font:Bold + Key: f2 Button@OBJECTIVES_BUTTON: X:486 Y:0 Width:160 Height:25 - Text:Objectives + Text:Objectives (F3) Visible:false Font:Bold + Key: f3 RadarBin@INGAME_RADAR_BIN: WorldInteractionController:INTERACTION_CONTROLLER PowerBin@INGAME_POWER_BIN: @@ -278,7 +281,7 @@ Container@OBSERVER_ROOT: Y:0 Width:160 Height:25 - Text:Options + Text:Options (ESC) Font:Bold Key:escape Button@INGAME_STATS_BUTTON: @@ -286,8 +289,9 @@ Container@OBSERVER_ROOT: Y:0 Width:160 Height:25 - Text:Statistics + Text:Statistics (F1) Font:Bold + Key:f1 Background@RADAR_BG: X:WINDOW_RIGHT-255 Y:5 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 69aa55b25d..0c0da76fb2 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -61,7 +61,7 @@ E2: BuildPaletteOrder: 10 Owner: soviet Prerequisites: barr - Hotkey: g + Hotkey: n Valued: Cost: 160 Tooltip: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 0be0ce84a0..76d2c3d7db 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -6,7 +6,7 @@ SS: Prerequisites: spen BuiltAt: spen Owner: soviet - Hotkey: b + Hotkey: u Valued: Cost: 950 Tooltip: @@ -238,7 +238,7 @@ PT: Prerequisites: syrd BuiltAt: syrd Owner: allies - Hotkey: g + Hotkey: b Valued: Cost: 500 Tooltip: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 1fe003b265..05075b2745 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -12,6 +12,7 @@ MSLO: Prerequisites: techcenter Owner: soviet,allies BuildLimit: 1 + Hotkey: m Building: Power: -100 Footprint: xx @@ -52,6 +53,7 @@ GAP: BuildPaletteOrder: 100 Prerequisites: atek Owner: allies + Hotkey: x Building: Power: -60 Footprint: _ x @@ -305,7 +307,7 @@ AGUN: BuildPaletteOrder: 50 Prerequisites: dome Owner: allies - Hotkey: g + Hotkey: y Valued: Cost: 800 Tooltip: @@ -1061,7 +1063,7 @@ AFLD: BuildPaletteOrder: 50 Prerequisites: dome Owner: soviet - Hotkey: g + Hotkey: i Valued: Cost: 500 Tooltip: @@ -1286,7 +1288,7 @@ FIX: BuildPaletteOrder: 30 Prerequisites: weap Owner: allies,soviet - Hotkey: d + Hotkey: x Valued: Cost: 1200 Tooltip: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 40ec8702e7..3f284ba2e9 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -36,7 +36,7 @@ V2RL: Queue: Vehicle BuildPaletteOrder: 40 Owner: allies - Hotkey: g + Hotkey: l Valued: Cost: 700 Tooltip: @@ -74,7 +74,7 @@ V2RL: BuildPaletteOrder: 60 Prerequisites: fix Owner: allies - Hotkey: f + Hotkey: x Valued: Cost: 850 Tooltip: @@ -487,7 +487,7 @@ MGG: BuildPaletteOrder: 150 Prerequisites: atek Owner: allies - Hotkey: s + Hotkey: y Valued: Cost: 1500 Tooltip: @@ -617,7 +617,7 @@ TTNK: BuildPaletteOrder: 130 Prerequisites: stek,tsla Owner: soviet - Hotkey: l + Hotkey: t Valued: Cost: 1350 Tooltip: