From eb3ab682e8e75a4186d4d6ad905e196de1370793 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 11 Nov 2017 21:13:07 +0000 Subject: [PATCH] Remove unused hotkeys from each mod. --- mods/cnc/chrome/settings.yaml | 4 +- mods/cnc/hotkeys.yaml | 19 +++ mods/cnc/mod.yaml | 4 +- mods/common/chrome/settings.yaml | 4 +- mods/common/hotkeys/game.yaml | 16 +-- mods/common/hotkeys/production-common.yaml | 99 +++++++++++++ mods/common/hotkeys/production-peractor.yaml | 7 + mods/common/hotkeys/production.yaml | 143 ------------------- mods/d2k/hotkeys.yaml | 31 ++++ mods/d2k/mod.yaml | 3 +- mods/ra/hotkeys.yaml | 27 ++++ mods/ra/mod.yaml | 3 +- mods/ts/hotkeys.yaml | 23 +++ mods/ts/mod.yaml | 3 +- 14 files changed, 225 insertions(+), 161 deletions(-) create mode 100644 mods/cnc/hotkeys.yaml create mode 100644 mods/common/hotkeys/production-common.yaml create mode 100644 mods/common/hotkeys/production-peractor.yaml delete mode 100644 mods/common/hotkeys/production.yaml create mode 100644 mods/d2k/hotkeys.yaml create mode 100644 mods/ra/hotkeys.yaml create mode 100644 mods/ts/hotkeys.yaml diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index c9f4e9fe32..a535722844 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -3,7 +3,7 @@ Container@SETTINGS_PANEL: HotkeyGroups: Game Commands: Template: TWO_COLUMN - Types: World, Menu + Types: OrderGenerator, World, Menu Viewport Commands: Template: TWO_COLUMN Types: Viewport @@ -18,7 +18,7 @@ Container@SETTINGS_PANEL: Types: Stance Production Commands: Template: THREE_COLUMN - Types: Production + Types: Production, ProductionSlot Support Power Commands: Template: THREE_COLUMN Types: SupportPower diff --git a/mods/cnc/hotkeys.yaml b/mods/cnc/hotkeys.yaml new file mode 100644 index 0000000000..e6276bd9dd --- /dev/null +++ b/mods/cnc/hotkeys.yaml @@ -0,0 +1,19 @@ +ProductionTypeBuilding: E + Description: Building Tab + Types: Production + +ProductionTypeDefense: R + Description: Defense Tab + Types: Production + +ProductionTypeInfantry: T + Description: Infantry Tab + Types: Production + +ProductionTypeVehicle: Y + Description: Vehicle Tab + Types: Production + +ProductionTypeAircraft: U + Description: Aircraft Tab + Types: Production \ No newline at end of file diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 07d6b57907..aa0c7a2b52 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -140,9 +140,11 @@ Translations: Hotkeys: common|hotkeys/game.yaml common|hotkeys/observer.yaml - common|hotkeys/production.yaml + common|hotkeys/production-common.yaml + common|hotkeys/production-peractor.yaml common|hotkeys/supportpowers.yaml common|hotkeys/viewport.yaml + cnc|hotkeys.yaml LoadScreen: CncLoadScreen Image: cnc|uibits/chrome.png diff --git a/mods/common/chrome/settings.yaml b/mods/common/chrome/settings.yaml index c295381934..98f2f1b760 100644 --- a/mods/common/chrome/settings.yaml +++ b/mods/common/chrome/settings.yaml @@ -3,7 +3,7 @@ Background@SETTINGS_PANEL: HotkeyGroups: Game Commands: Template: TWO_COLUMN - Types: World, Menu + Types: OrderGenerator, World, Menu Viewport Commands: Template: TWO_COLUMN Types: Viewport @@ -18,7 +18,7 @@ Background@SETTINGS_PANEL: Types: Stance Production Commands: Template: THREE_COLUMN - Types: Production + Types: Production, ProductionSlot Support Power Commands: Template: THREE_COLUMN Types: SupportPower diff --git a/mods/common/hotkeys/game.yaml b/mods/common/hotkeys/game.yaml index 38519daf89..ac9d73363f 100644 --- a/mods/common/hotkeys/game.yaml +++ b/mods/common/hotkeys/game.yaml @@ -18,25 +18,21 @@ SelectUnitsByType: W Description: Select units by type Types: World -PlaceBeacon: B - Description: Place beacon - Types: World - Pause: PAUSE Description: Pause / Unpause Types: World Sell: Z Description: Sell mode - Types: World - -PowerDown: X - Description: Power-down mode - Types: World + Types: OrderGenerator Repair: C Description: Repair mode - Types: World + Types: OrderGenerator + +PlaceBeacon: B + Description: Place beacon + Types: OrderGenerator CycleStatusBars: COMMA Description: Cycle status bars display diff --git a/mods/common/hotkeys/production-common.yaml b/mods/common/hotkeys/production-common.yaml new file mode 100644 index 0000000000..cf6343d4b8 --- /dev/null +++ b/mods/common/hotkeys/production-common.yaml @@ -0,0 +1,99 @@ +CycleProductionBuildings: TAB + Description: Next facility + Types: Production + +Production01: F1 + Description: Slot 01 + Types: ProductionSlot + +Production02: F2 + Description: Slot 02 + Types: ProductionSlot + +Production03: F3 + Description: Slot 03 + Types: ProductionSlot + +Production04: F4 + Description: Slot 04 + Types: ProductionSlot + +Production05: F5 + Description: Slot 05 + Types: ProductionSlot + +Production06: F6 + Description: Slot 06 + Types: ProductionSlot + +Production07: F7 + Description: Slot 07 + Types: ProductionSlot + +Production08: F8 + Description: Slot 08 + Types: ProductionSlot + +Production09: F9 + Description: Slot 09 + Types: ProductionSlot + +Production10: F10 + Description: Slot 10 + Types: ProductionSlot + +Production11: F11 + Description: Slot 11 + Types: ProductionSlot + +Production12: F12 + Description: Slot 12 + Types: ProductionSlot + +Production13: F1 CTRL + Description: Slot 13 + Types: ProductionSlot + +Production14: F2 CTRL + Description: Slot 14 + Types: ProductionSlot + +Production15: F3 CTRL + Description: Slot 15 + Types: ProductionSlot + +Production16: F4 CTRL + Description: Slot 16 + Types: ProductionSlot + +Production17: F5 CTRL + Description: Slot 17 + Types: ProductionSlot + +Production18: F6 CTRL + Description: Slot 18 + Types: ProductionSlot + +Production19: F7 CTRL + Description: Slot 19 + Types: ProductionSlot + +Production20: F8 CTRL + Description: Slot 20 + Types: ProductionSlot + +Production21: F9 CTRL + Description: Slot 21 + Types: ProductionSlot + +Production22: F10 CTRL + Description: Slot 22 + Types: ProductionSlot + +Production23: F11 CTRL + Description: Slot 23 + Types: ProductionSlot + +Production24: F12 CTRL + Description: Slot 24 + Types: ProductionSlot diff --git a/mods/common/hotkeys/production-peractor.yaml b/mods/common/hotkeys/production-peractor.yaml new file mode 100644 index 0000000000..6074e8541e --- /dev/null +++ b/mods/common/hotkeys/production-peractor.yaml @@ -0,0 +1,7 @@ +NextProductionTab: PAGEDOWN + Description: Next tab + Types: Production + +PreviousProductionTab: PAGEUP + Description: Previous tab + Types: Production diff --git a/mods/common/hotkeys/production.yaml b/mods/common/hotkeys/production.yaml deleted file mode 100644 index 737d0cfe08..0000000000 --- a/mods/common/hotkeys/production.yaml +++ /dev/null @@ -1,143 +0,0 @@ -NextProductionTab: PAGEDOWN - Description: Next tab - Types: Production - -PreviousProductionTab: PAGEUP - Description: Previous tab - Types: Production - -CycleProductionBuildings: TAB - Description: Next facility - Types: Production - -ProductionTypeBuilding: E - Description: Building Tab - Types: Production - -ProductionTypeDefense: R - Description: Defense Tab - Types: Production - -ProductionTypeInfantry: T - Description: Infantry Tab - Types: Production - -ProductionTypeVehicle: Y - Description: Vehicle Tab - Types: Production - -ProductionTypeAircraft: U - Description: Aircraft Tab - Types: Production - -ProductionTypeNaval: I - Description: Naval Tab - Types: Production - -ProductionTypeTank: I - Description: Tank Tab - Types: Production - -ProductionTypeMerchant: O - Description: Starport Tab - Types: Production - -ProductionTypeUpgrade: R - Description: Upgrade Tab - Types: Production - -Production01: F1 - Description: Slot 01 - Types: Production - -Production02: F2 - Description: Slot 02 - Types: Production - -Production03: F3 - Description: Slot 03 - Types: Production - -Production04: F4 - Description: Slot 04 - Types: Production - -Production05: F5 - Description: Slot 05 - Types: Production - -Production06: F6 - Description: Slot 06 - Types: Production - -Production07: F7 - Description: Slot 07 - Types: Production - -Production08: F8 - Description: Slot 08 - Types: Production - -Production09: F9 - Description: Slot 09 - Types: Production - -Production10: F10 - Description: Slot 10 - Types: Production - -Production11: F11 - Description: Slot 11 - Types: Production - -Production12: F12 - Description: Slot 12 - Types: Production - -Production13: F1 CTRL - Description: Slot 13 - Types: Production - -Production14: F2 CTRL - Description: Slot 14 - Types: Production - -Production15: F3 CTRL - Description: Slot 15 - Types: Production - -Production16: F4 CTRL - Description: Slot 16 - Types: Production - -Production17: F5 CTRL - Description: Slot 17 - Types: Production - -Production18: F6 CTRL - Description: Slot 18 - Types: Production - -Production19: F7 CTRL - Description: Slot 19 - Types: Production - -Production20: F8 CTRL - Description: Slot 20 - Types: Production - -Production21: F9 CTRL - Description: Slot 21 - Types: Production - -Production22: F10 CTRL - Description: Slot 22 - Types: Production - -Production23: F11 CTRL - Description: Slot 23 - Types: Production - -Production24: F12 CTRL - Description: Slot 24 - Types: Production diff --git a/mods/d2k/hotkeys.yaml b/mods/d2k/hotkeys.yaml new file mode 100644 index 0000000000..f7db18e4a3 --- /dev/null +++ b/mods/d2k/hotkeys.yaml @@ -0,0 +1,31 @@ +ProductionTypeBuilding: E + Description: Building Tab + Types: Production + +ProductionTypeUpgrade: R + Description: Upgrade Tab + Types: Production + +ProductionTypeInfantry: T + Description: Infantry Tab + Types: Production + +ProductionTypeVehicle: Y + Description: Vehicle Tab + Types: Production + +ProductionTypeAircraft: U + Description: Aircraft Tab + Types: Production + +ProductionTypeTank: I + Description: Tank Tab + Types: Production + +ProductionTypeMerchant: O + Description: Starport Tab + Types: Production + +PowerDown: X + Description: Power-down mode + Types: OrderGenerator diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index f70999e6f4..8f613e8338 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -128,9 +128,10 @@ Translations: Hotkeys: common|hotkeys/game.yaml common|hotkeys/observer.yaml - common|hotkeys/production.yaml + common|hotkeys/production-common.yaml common|hotkeys/supportpowers.yaml common|hotkeys/viewport.yaml + d2k|hotkeys.yaml LoadScreen: LogoStripeLoadScreen Image: d2k|uibits/loadscreen.png diff --git a/mods/ra/hotkeys.yaml b/mods/ra/hotkeys.yaml new file mode 100644 index 0000000000..f8da28a1cf --- /dev/null +++ b/mods/ra/hotkeys.yaml @@ -0,0 +1,27 @@ +ProductionTypeBuilding: E + Description: Building Tab + Types: Production + +ProductionTypeDefense: R + Description: Defense Tab + Types: Production + +ProductionTypeInfantry: T + Description: Infantry Tab + Types: Production + +ProductionTypeVehicle: Y + Description: Vehicle Tab + Types: Production + +ProductionTypeAircraft: U + Description: Aircraft Tab + Types: Production + +ProductionTypeNaval: I + Description: Naval Tab + Types: Production + +PowerDown: X + Description: Power-down mode + Types: OrderGenerator diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 58abf16e7b..33124b27e9 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -144,9 +144,10 @@ Translations: Hotkeys: common|hotkeys/game.yaml common|hotkeys/observer.yaml - common|hotkeys/production.yaml + common|hotkeys/production-common.yaml common|hotkeys/supportpowers.yaml common|hotkeys/viewport.yaml + ra|hotkeys.yaml LoadScreen: LogoStripeLoadScreen Image: ra|uibits/loadscreen.png diff --git a/mods/ts/hotkeys.yaml b/mods/ts/hotkeys.yaml new file mode 100644 index 0000000000..c9254073ed --- /dev/null +++ b/mods/ts/hotkeys.yaml @@ -0,0 +1,23 @@ +ProductionTypeBuilding: E + Description: Building Tab + Types: Production + +ProductionTypeDefense: R + Description: Defense Tab + Types: Production + +ProductionTypeInfantry: T + Description: Infantry Tab + Types: Production + +ProductionTypeVehicle: Y + Description: Vehicle Tab + Types: Production + +ProductionTypeAircraft: U + Description: Aircraft Tab + Types: Production + +PowerDown: X + Description: Power-down mode + Types: OrderGenerator diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 6635384987..41264d5952 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -186,9 +186,10 @@ Translations: Hotkeys: common|hotkeys/game.yaml common|hotkeys/observer.yaml - common|hotkeys/production.yaml + common|hotkeys/production-common.yaml common|hotkeys/supportpowers.yaml common|hotkeys/viewport.yaml + ts|hotkeys.yaml LoadScreen: LogoStripeLoadScreen Image: ts|uibits/loadscreen.png