diff --git a/OpenRA.Game/HotkeyDefinition.cs b/OpenRA.Game/HotkeyDefinition.cs index 7a949125715a..777558389211 100644 --- a/OpenRA.Game/HotkeyDefinition.cs +++ b/OpenRA.Game/HotkeyDefinition.cs @@ -10,11 +10,14 @@ #endregion using System.Collections.Generic; +using System.Linq; namespace OpenRA { public sealed class HotkeyDefinition { + public const string ContextFluentPrefix = "hotkey-context"; + public readonly string Name; public readonly Hotkey Default = Hotkey.Invalid; @@ -45,7 +48,8 @@ public HotkeyDefinition(string name, MiniYaml node) Types = FieldLoader.GetValue>("Types", typesYaml.Value); if (nodeDict.TryGetValue("Contexts", out var contextYaml)) - Contexts = FieldLoader.GetValue>("Contexts", contextYaml.Value); + Contexts = FieldLoader.GetValue>("Contexts", contextYaml.Value) + .Select(c => ContextFluentPrefix + "." + c).ToHashSet(); if (nodeDict.TryGetValue("Platform", out var platformYaml)) { diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs index 4b66fb496ad0..8b766827a649 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs @@ -26,7 +26,7 @@ public class HotkeysSettingsLogic : ChromeLogic const string DuplicateNotice = "label-duplicate-notice"; [FluentReference] - const string AnyContext = "hotkey-context-any"; + const string AnyContext = HotkeyDefinition.ContextFluentPrefix + "-any"; readonly ModData modData; readonly Dictionary logicArgs; diff --git a/mods/cnc/hotkeys.yaml b/mods/cnc/hotkeys.yaml index 6149de4cf7d8..be9b3a6496c8 100644 --- a/mods/cnc/hotkeys.yaml +++ b/mods/cnc/hotkeys.yaml @@ -1,34 +1,34 @@ NextProductionTab: PAGEDOWN Description: hotkey-description-nextproductiontab Types: Production - Contexts: hotkey-context-player + Contexts: player PreviousProductionTab: PAGEUP Description: hotkey-description-previousproductiontab Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeBuilding: E Description: hotkey-description-productiontypebuilding Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeDefense: R Description: hotkey-description-productiontypedefense Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeInfantry: T Description: hotkey-description-productiontypeinfantry Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeVehicle: Y Description: hotkey-description-productiontypevehicle Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeAircraft: U Description: hotkey-description-productiontypeaircraft Types: Production - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/common/hotkeys/chat.yaml b/mods/common/hotkeys/chat.yaml index b577af2d3cc9..ef0cc8c3dd75 100644 --- a/mods/common/hotkeys/chat.yaml +++ b/mods/common/hotkeys/chat.yaml @@ -1,21 +1,21 @@ OpenTeamChat: Return Description: hotkey-description-openteamchat Types: Chat - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator OpenGeneralChat: Return Shift Description: hotkey-description-opengeneralchat Types: Chat - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator ToggleChatMode: Tab Shift Description: hotkey-description-togglechatmode Types: Chat - Contexts: hotkey-context-chat-input, hotkey-context-menu + Contexts: chat-input, menu Readonly: True Autocomplete: Tab Description: hotkey-description-autocomplete Types: Chat - Contexts: hotkey-context-chat-input + Contexts: chat-input Readonly: True diff --git a/mods/common/hotkeys/control-groups.yaml b/mods/common/hotkeys/control-groups.yaml index db35fd177615..9a9d4a0c43d2 100644 --- a/mods/common/hotkeys/control-groups.yaml +++ b/mods/common/hotkeys/control-groups.yaml @@ -1,294 +1,294 @@ ControlGroupSelect01: NUMBER_1 Description: hotkey-description-controlgroupselect01 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect02: NUMBER_2 Description: hotkey-description-controlgroupselect02 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect03: NUMBER_3 Description: hotkey-description-controlgroupselect03 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect04: NUMBER_4 Description: hotkey-description-controlgroupselect04 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect05: NUMBER_5 Description: hotkey-description-controlgroupselect05 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect06: NUMBER_6 Description: hotkey-description-controlgroupselect06 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect07: NUMBER_7 Description: hotkey-description-controlgroupselect07 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect08: NUMBER_8 Description: hotkey-description-controlgroupselect08 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect09: NUMBER_9 Description: hotkey-description-controlgroupselect09 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupSelect10: NUMBER_0 Description: hotkey-description-controlgroupselect10 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCreate01: NUMBER_1 Ctrl Description: hotkey-description-controlgroupcreate01 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_1 Meta ControlGroupCreate02: NUMBER_2 Ctrl Description: hotkey-description-controlgroupcreate02 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_2 Meta ControlGroupCreate03: NUMBER_3 Ctrl Description: hotkey-description-controlgroupcreate03 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_3 Meta ControlGroupCreate04: NUMBER_4 Ctrl Description: hotkey-description-controlgroupcreate04 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_4 Meta ControlGroupCreate05: NUMBER_5 Ctrl Description: hotkey-description-controlgroupcreate05 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_5 Meta ControlGroupCreate06: NUMBER_6 Ctrl Description: hotkey-description-controlgroupcreate06 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_6 Meta ControlGroupCreate07: NUMBER_7 Ctrl Description: hotkey-description-controlgroupcreate07 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_7 Meta ControlGroupCreate08: NUMBER_8 Ctrl Description: hotkey-description-controlgroupcreate08 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_8 Meta ControlGroupCreate09: NUMBER_9 Ctrl Description: hotkey-description-controlgroupcreate09 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_9 Meta ControlGroupCreate10: NUMBER_0 Ctrl Description: hotkey-description-controlgroupcreate10 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_0 Meta ControlGroupAddTo01: NUMBER_1 Ctrl, Shift Description: hotkey-description-controlgroupaddto01 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_1 Meta, Shift ControlGroupAddTo02: NUMBER_2 Ctrl, Shift Description: hotkey-description-controlgroupaddto02 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_2 Meta, Shift ControlGroupAddTo03: NUMBER_3 Ctrl, Shift Description: hotkey-description-controlgroupaddto03 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_3 Meta, Shift ControlGroupAddTo04: NUMBER_4 Ctrl, Shift Description: hotkey-description-controlgroupaddto04 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_4 Meta, Shift ControlGroupAddTo05: NUMBER_5 Ctrl, Shift Description: hotkey-description-controlgroupaddto05 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_5 Meta, Shift ControlGroupAddTo06: NUMBER_6 Ctrl, Shift Description: hotkey-description-controlgroupaddto06 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_6 Meta, Shift ControlGroupAddTo07: NUMBER_7 Ctrl, Shift Description: hotkey-description-controlgroupaddto07 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_7 Meta, Shift ControlGroupAddTo08: NUMBER_8 Ctrl, Shift Description: hotkey-description-controlgroupaddto08 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_8 Meta, Shift ControlGroupAddTo09: NUMBER_9 Ctrl, Shift Description: hotkey-description-controlgroupaddto09 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_9 Meta, Shift ControlGroupAddTo10: NUMBER_0 Ctrl, Shift Description: hotkey-description-controlgroupaddto10 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player Platform: OSX: NUMBER_0 Meta, Shift ControlGroupCombineWith01: NUMBER_1 Shift Description: hotkey-description-controlgroupcombinewith01 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith02: NUMBER_2 Shift Description: hotkey-description-controlgroupcombinewith02 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith03: NUMBER_3 Shift Description: hotkey-description-controlgroupcombinewith03 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith04: NUMBER_4 Shift Description: hotkey-description-controlgroupcombinewith04 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith05: NUMBER_5 Shift Description: hotkey-description-controlgroupcombinewith05 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith06: NUMBER_6 Shift Description: hotkey-description-controlgroupcombinewith06 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith07: NUMBER_7 Shift Description: hotkey-description-controlgroupcombinewith07 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith08: NUMBER_8 Shift Description: hotkey-description-controlgroupcombinewith08 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith09: NUMBER_9 Shift Description: hotkey-description-controlgroupcombinewith09 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupCombineWith10: NUMBER_0 Shift Description: hotkey-description-controlgroupcombinewith10 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo01: NUMBER_1 Alt Description: hotkey-description-controlgroupjumpto01 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo02: NUMBER_2 Alt Description: hotkey-description-controlgroupjumpto02 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo03: NUMBER_3 Alt Description: hotkey-description-controlgroupjumpto03 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo04: NUMBER_4 Alt Description: hotkey-description-controlgroupjumpto04 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo05: NUMBER_5 Alt Description: hotkey-description-controlgroupjumpto05 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo06: NUMBER_6 Alt Description: hotkey-description-controlgroupjumpto06 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo07: NUMBER_7 Alt Description: hotkey-description-controlgroupjumpto07 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo08: NUMBER_8 Alt Description: hotkey-description-controlgroupjumpto08 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo09: NUMBER_9 Alt Description: hotkey-description-controlgroupjumpto09 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player ControlGroupJumpTo10: NUMBER_0 Alt Description: hotkey-description-controlgroupjumpto10 Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player RemoveFromControlGroup: Description: hotkey-description-removefromcontrolgroup Types: ControlGroups - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/common/hotkeys/editor.yaml b/mods/common/hotkeys/editor.yaml index 2127c9bd609e..ba704043bace 100644 --- a/mods/common/hotkeys/editor.yaml +++ b/mods/common/hotkeys/editor.yaml @@ -1,14 +1,14 @@ EditorUndo: Z Ctrl Description: hotkey-description-editorundo Types: Editor - Contexts: hotkey-context-editor + Contexts: editor Platform: OSX: Z Meta EditorRedo: Y Ctrl Description: hotkey-description-editorredo Types: Editor - Contexts: hotkey-context-editor + Contexts: editor Platform: OSX: Z Meta, Shift Linux: Z Ctrl, Shift @@ -16,70 +16,70 @@ EditorRedo: Y Ctrl EditorCopy: C Ctrl Description: hotkey-description-editorcopy Types: Editor - Contexts: hotkey-context-editor + Contexts: editor Platform: OSX: C Meta EditorQuickSave: S Ctrl Description: hotkey-description-editorquicksave Types: Editor - Contexts: hotkey-context-editor + Contexts: editor Platform: OSX: S Meta EditorPaste: V Ctrl Description: hotkey-description-editorpaste Types: Editor - Contexts: hotkey-context-editor + Contexts: editor Platform: OSX: V Meta EditorSelectTab: E Description: hotkey-description-editorselecttab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorTilesTab: R Description: hotkey-description-editortilestab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorOverlaysTab: T Description: hotkey-description-editoroverlaystab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorActorsTab: Y Description: hotkey-description-editoractorstab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorToolsTab: U Description: hotkey-description-editortoolstab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorHistoryTab: I Description: hotkey-description-editorhistorytab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorSettingsTab: O Description: hotkey-description-editorsettingstab Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorToggleGridOverlay: F1 Description: hotkey-description-editortogglegridoverlay Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorToggleBuildableOverlay: F2 Description: hotkey-description-editortogglebuildableoverlay Types: Editor - Contexts: hotkey-context-editor + Contexts: editor EditorToggleMarkerOverlay: F3 Description: hotkey-description-editortogglemarkeroverlay Types: Editor - Contexts: hotkey-context-editor + Contexts: editor diff --git a/mods/common/hotkeys/game.yaml b/mods/common/hotkeys/game.yaml index 62aa60469591..ec71bf196deb 100644 --- a/mods/common/hotkeys/game.yaml +++ b/mods/common/hotkeys/game.yaml @@ -1,134 +1,134 @@ CycleBase: H Description: hotkey-description-cyclebase Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator ToLastEvent: SPACE Description: hotkey-description-tolastevent Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator ToSelection: HOME Description: hotkey-description-toselection Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator SelectAllUnits: Q Description: hotkey-description-selectallunits Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator SelectUnitsByType: W Description: hotkey-description-selectunitsbytype Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator CycleHarvesters: N Description: hotkey-description-cycleharvesters Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator Pause: PAUSE Description: hotkey-description-pause Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator Sell: Z Description: hotkey-description-sell Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player Repair: C Description: hotkey-description-repair Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player PlaceBeacon: B Description: hotkey-description-placebeacon Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player CycleStatusBars: COMMA Description: hotkey-description-cyclestatusbars Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator ToggleMute: M Description: hotkey-description-togglemute Types: World - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator TogglePlayerStanceColor: COMMA Ctrl Description: hotkey-description-toggleplayerstancecolor Types: World - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator TakeScreenshot: P Ctrl Description: hotkey-description-takescreenshot Types: World - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator AttackMove: A Description: hotkey-description-attackmove Types: Unit - Contexts: hotkey-context-player + Contexts: player Stop: S Description: hotkey-description-stop Types: Unit - Contexts: hotkey-context-player + Contexts: player Scatter: X Ctrl Description: hotkey-description-scatter Types: Unit - Contexts: hotkey-context-player + Contexts: player Deploy: F Description: hotkey-description-deploy Types: Unit - Contexts: hotkey-context-player + Contexts: player Guard: D Description: hotkey-description-guard Types: Unit - Contexts: hotkey-context-player + Contexts: player StanceAttackAnything: A Alt Description: hotkey-description-stanceattackanything Types: Stance - Contexts: hotkey-context-player + Contexts: player StanceDefend: S Alt Description: hotkey-description-stancedefend Types: Stance - Contexts: hotkey-context-player + Contexts: player StanceReturnFire: D Alt Description: hotkey-description-stancereturnfire Types: Stance - Contexts: hotkey-context-player + Contexts: player StanceHoldFire: F Alt Description: hotkey-description-stanceholdfire Types: Stance - Contexts: hotkey-context-player + Contexts: player StopMusic: AUDIOSTOP Description: hotkey-description-stopmusic Types: Music - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator PauseMusic: AUDIOPLAY Description: hotkey-description-pausemusic Types: Music - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator PrevMusic: AUDIOPREV Description: hotkey-description-prevmusic Types: Music - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator NextMusic: AUDIONEXT Description: hotkey-description-nextmusic Types: Music - Contexts: hotkey-context-menu, hotkey-context-player, hotkey-context-spectator + Contexts: menu, player, spectator diff --git a/mods/common/hotkeys/observer.yaml b/mods/common/hotkeys/observer.yaml index 618bc4b6e28d..b95c6c3653d4 100644 --- a/mods/common/hotkeys/observer.yaml +++ b/mods/common/hotkeys/observer.yaml @@ -1,74 +1,74 @@ ObserverCombinedView: MINUS Description: hotkey-description-observercombinedview Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator ObserverWorldView: EQUALS Description: hotkey-description-observerworldview Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator ReplaySpeedSlow: F9 Description: hotkey-description-replayspeedslow Types: Replay - Contexts: hotkey-context-spectator + Contexts: spectator ReplaySpeedRegular: F10 Description: hotkey-description-replayspeedregular Types: Replay - Contexts: hotkey-context-spectator + Contexts: spectator ReplaySpeedFast: F11 Description: hotkey-description-replayspeedfast Types: Replay - Contexts: hotkey-context-spectator + Contexts: spectator ReplaySpeedMax: F12 Description: hotkey-description-replayspeedmax Types: Replay - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsNone: F1 Description: hotkey-description-statisticsnone Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsBasic: F2 Description: hotkey-description-statisticsbasic Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsEconomy: F3 Description: hotkey-description-statisticseconomy Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsProduction: F4 Description: hotkey-description-statisticsproduction Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsSupportPowers: F5 Description: hotkey-description-statisticssupportpowers Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsCombat: F6 Description: hotkey-description-statisticscombat Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsArmy: F7 Description: hotkey-description-statisticsarmy Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsGraph: Description: hotkey-description-statisticsgraph Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator StatisticsArmyGraph: Description: hotkey-description-statisticsarmygraph Types: Observer - Contexts: hotkey-context-spectator + Contexts: spectator diff --git a/mods/common/hotkeys/production-common.yaml b/mods/common/hotkeys/production-common.yaml index 74e2b7b5088a..9e05718e629a 100644 --- a/mods/common/hotkeys/production-common.yaml +++ b/mods/common/hotkeys/production-common.yaml @@ -1,129 +1,129 @@ CycleProductionBuildings: TAB Ctrl Description: hotkey-description-cycleproductionbuildings Types: Production - Contexts: hotkey-context-player, hotkey-context-spectator + Contexts: player, spectator SelectProductionBuilding: TAB Description: hotkey-description-selectproductionbuilding Types: Production - Contexts: hotkey-context-player + Contexts: player Production01: F1 Description: hotkey-description-production01 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production02: F2 Description: hotkey-description-production02 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production03: F3 Description: hotkey-description-production03 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production04: F4 Description: hotkey-description-production04 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production05: F5 Description: hotkey-description-production05 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production06: F6 Description: hotkey-description-production06 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production07: F7 Description: hotkey-description-production07 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production08: F8 Description: hotkey-description-production08 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production09: F9 Description: hotkey-description-production09 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production10: F10 Description: hotkey-description-production10 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production11: F11 Description: hotkey-description-production11 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production12: F12 Description: hotkey-description-production12 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production13: F1 CTRL Description: hotkey-description-production13 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production14: F2 CTRL Description: hotkey-description-production14 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production15: F3 CTRL Description: hotkey-description-production15 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production16: F4 CTRL Description: hotkey-description-production16 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production17: F5 CTRL Description: hotkey-description-production17 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production18: F6 CTRL Description: hotkey-description-production18 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production19: F7 CTRL Description: hotkey-description-production19 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production20: F8 CTRL Description: hotkey-description-production20 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production21: F9 CTRL Description: hotkey-description-production21 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production22: F10 CTRL Description: hotkey-description-production22 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production23: F11 CTRL Description: hotkey-description-production23 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player Production24: F12 CTRL Description: hotkey-description-production24 Types: ProductionSlot - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/common/hotkeys/supportpowers.yaml b/mods/common/hotkeys/supportpowers.yaml index 482d84601917..dcccc03c9aef 100644 --- a/mods/common/hotkeys/supportpowers.yaml +++ b/mods/common/hotkeys/supportpowers.yaml @@ -1,29 +1,29 @@ SupportPower01: Description: hotkey-description-supportpower01 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player SupportPower02: Description: hotkey-description-supportpower02 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player SupportPower03: Description: hotkey-description-supportpower03 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player SupportPower04: Description: hotkey-description-supportpower04 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player SupportPower05: Description: hotkey-description-supportpower05 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player SupportPower06: Description: hotkey-description-supportpower06 Types: SupportPower - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/common/hotkeys/viewport.yaml b/mods/common/hotkeys/viewport.yaml index f00626f1a32a..f2c2f94ab396 100644 --- a/mods/common/hotkeys/viewport.yaml +++ b/mods/common/hotkeys/viewport.yaml @@ -1,94 +1,94 @@ MapScrollUp: UP Description: hotkey-description-mapscrollup Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapScrollDown: DOWN Description: hotkey-description-mapscrolldown Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapScrollLeft: LEFT Description: hotkey-description-mapscrollleft Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapScrollRight: RIGHT Description: hotkey-description-mapscrollright Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapJumpToTopEdge: UP Alt Description: hotkey-description-mapjumptotopedge Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapJumpToBottomEdge: DOWN Alt Description: hotkey-description-mapjumptobottomedge Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapJumpToLeftEdge: LEFT Alt Description: hotkey-description-mapjumptoleftedge Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapJumpToRightEdge: RIGHT Alt Description: hotkey-description-mapjumptorightedge Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkSave01: Q Ctrl Description: hotkey-description-mapbookmarksave01 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkRestore01: Q Alt Description: hotkey-description-mapbookmarkrestore01 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkSave02: W Ctrl Description: hotkey-description-mapbookmarksave02 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkRestore02: W Alt Description: hotkey-description-mapbookmarkrestore02 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkSave03: E Ctrl Description: hotkey-description-mapbookmarksave03 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkRestore03: E Alt Description: hotkey-description-mapbookmarkrestore03 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkSave04: R Ctrl Description: hotkey-description-mapbookmarksave04 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor MapBookmarkRestore04: R Alt Description: hotkey-description-mapbookmarkrestore04 Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor ZoomIn: RIGHTBRACKET Description: hotkey-description-zoomin Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor ZoomOut: LEFTBRACKET Description: hotkey-description-zoomout Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor ResetZoom: PERIOD Description: hotkey-description-resetzoom Types: Viewport - Contexts: hotkey-context-player, hotkey-context-spectator, hotkey-context-editor + Contexts: player, spectator, editor diff --git a/mods/common/languages/hotkeys/en.ftl b/mods/common/languages/hotkeys/en.ftl index ded8305aa664..611fe4469bb8 100644 --- a/mods/common/languages/hotkeys/en.ftl +++ b/mods/common/languages/hotkeys/en.ftl @@ -1,8 +1,9 @@ -hotkey-context-player = Player -hotkey-context-spectator = Spectator -hotkey-context-chat-input = Chat Input -hotkey-context-menu = Menu -hotkey-context-editor = Editor +hotkey-context = + .player = Player + .spectator = Spectator + .chat-input = Chat Input + .menu = Menu + .editor = Editor ## chat.yaml hotkey-description-openteamchat = Open Team Chat diff --git a/mods/d2k/hotkeys.yaml b/mods/d2k/hotkeys.yaml index 7f319096fba1..a14984665b9c 100644 --- a/mods/d2k/hotkeys.yaml +++ b/mods/d2k/hotkeys.yaml @@ -1,39 +1,39 @@ ProductionTypeBuilding: E Description: hotkey-description-productiontypebuilding Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeUpgrade: R Description: hotkey-description-productiontypeupgrade Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeInfantry: T Description: hotkey-description-productiontypeinfantry Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeVehicle: Y Description: hotkey-description-productiontypevehicle Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeAircraft: U Description: hotkey-description-productiontypeaircraft Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeTank: I Description: hotkey-description-productiontypetank Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeMerchant: O Description: hotkey-description-productiontypemerchant Types: Production - Contexts: hotkey-context-player + Contexts: player PowerDown: X Description: hotkey-description-powerdown Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/ra/hotkeys.yaml b/mods/ra/hotkeys.yaml index 22c352b77a26..8ed1bfb0a349 100644 --- a/mods/ra/hotkeys.yaml +++ b/mods/ra/hotkeys.yaml @@ -1,34 +1,34 @@ ProductionTypeBuilding: E Description: hotkey-description-productiontypebuilding Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeDefense: R Description: hotkey-description-productiontypedefense Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeInfantry: T Description: hotkey-description-productiontypeinfantry Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeVehicle: Y Description: hotkey-description-productiontypevehicle Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeAircraft: U Description: hotkey-description-productiontypeaircraft Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeNaval: I Description: hotkey-description-productiontypenaval Types: Production - Contexts: hotkey-context-player + Contexts: player PowerDown: X Description: hotkey-description-powerdown Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player diff --git a/mods/ts/hotkeys.yaml b/mods/ts/hotkeys.yaml index 99e206e6c559..bac63d31095d 100644 --- a/mods/ts/hotkeys.yaml +++ b/mods/ts/hotkeys.yaml @@ -1,54 +1,54 @@ ProductionTypeBuilding: E Description: hotkey-description-productiontypebuilding Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeDefense: R Description: hotkey-description-productiontypedefense Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeInfantry: T Description: hotkey-description-productiontypeinfantry Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeVehicle: Y Description: hotkey-description-productiontypevehicle Types: Production - Contexts: hotkey-context-player + Contexts: player ProductionTypeAircraft: U Description: hotkey-description-productiontypeaircraft Types: Production - Contexts: hotkey-context-player + Contexts: player PowerDown: X Description: hotkey-description-powerdown Types: OrderGenerator - Contexts: hotkey-context-player + Contexts: player DecreaseDepthPreviewContrast: LEFTBRACKET SHIFT Description: hotkey-description-decreasedepthpreviewcontrast Types: DepthDebug - Contexts: hotkey-context-player + Contexts: player IncreaseDepthPreviewContrast: RIGHTBRACKET SHIFT Description: hotkey-description-increasedepthpreviewcontrast Types: DepthDebug - Contexts: hotkey-context-player + Contexts: player DecreaseDepthPreviewOffset: SEMICOLON SHIFT Description: hotkey-description-decreasedepthpreviewoffset Types: DepthDebug - Contexts: hotkey-context-player + Contexts: player IncreaseDepthPreviewOffset: QUOTE SHIFT Description: hotkey-description-increasedepthpreviewoffset Types: DepthDebug - Contexts: hotkey-context-player + Contexts: player ToggleDepthPreview: BACKSLASH SHIFT Description: hotkey-description-toggledepthpreview Types: DepthDebug - Contexts: hotkey-context-player + Contexts: player