Remove unused hotkeys from each mod.

2017-11-11 21:13:07 +00:00
parent b4c5346346
commit eb3ab682e8
14 changed files with 225 additions and 161 deletions
--- 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
--- a/mods/cnc/hotkeys.yaml
+++ 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
--- 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
--- 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
--- 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
--- a/mods/common/hotkeys/production-common.yaml
+++ 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
--- a/mods/common/hotkeys/production-peractor.yaml
+++ 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
--- a/mods/common/hotkeys/production.yaml
+++ b/mods/common/hotkeys/production.yaml
@@ -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
--- a/mods/d2k/hotkeys.yaml
+++ 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
--- 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
--- a/mods/ra/hotkeys.yaml
+++ 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
--- 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
--- a/mods/ts/hotkeys.yaml
+++ 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
--- 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