Merge pull request #7541 from Mailaender/d2k-build-hotkeys
Fixed the hard-coded Dune 2000 production tab hotkeys
This commit is contained in:
@@ -209,6 +209,8 @@ namespace OpenRA
|
|||||||
public Hotkey ProductionTypeVehicleKey = new Hotkey(Keycode.Y, Modifiers.None);
|
public Hotkey ProductionTypeVehicleKey = new Hotkey(Keycode.Y, Modifiers.None);
|
||||||
public Hotkey ProductionTypeAircraftKey = new Hotkey(Keycode.U, Modifiers.None);
|
public Hotkey ProductionTypeAircraftKey = new Hotkey(Keycode.U, Modifiers.None);
|
||||||
public Hotkey ProductionTypeNavalKey = new Hotkey(Keycode.I, Modifiers.None);
|
public Hotkey ProductionTypeNavalKey = new Hotkey(Keycode.I, Modifiers.None);
|
||||||
|
public Hotkey ProductionTypeTankKey = new Hotkey(Keycode.I, Modifiers.None);
|
||||||
|
public Hotkey ProductionTypeMerchantKey = new Hotkey(Keycode.O, Modifiers.None);
|
||||||
|
|
||||||
public Hotkey GetProductionHotkey(int index)
|
public Hotkey GetProductionHotkey(int index)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -423,7 +423,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
|||||||
{ "ProductionTypeInfantryKey", "Infantry Tab" },
|
{ "ProductionTypeInfantryKey", "Infantry Tab" },
|
||||||
{ "ProductionTypeVehicleKey", "Vehicle Tab" },
|
{ "ProductionTypeVehicleKey", "Vehicle Tab" },
|
||||||
{ "ProductionTypeAircraftKey", "Aircraft Tab" },
|
{ "ProductionTypeAircraftKey", "Aircraft Tab" },
|
||||||
{ "ProductionTypeNavalKey", "Naval Tab" }
|
{ "ProductionTypeNavalKey", "Naval Tab" },
|
||||||
|
{ "ProductionTypeTankKey", "Tank Tab" },
|
||||||
|
{ "ProductionTypeMerchantKey", "Starport Tab" }
|
||||||
};
|
};
|
||||||
|
|
||||||
for (var i = 1; i <= 24; i++)
|
for (var i = 1; i <= 24; i++)
|
||||||
|
|||||||
@@ -258,7 +258,6 @@ Container@PLAYER_WIDGETS:
|
|||||||
Height: 243
|
Height: 243
|
||||||
Children:
|
Children:
|
||||||
ProductionTypeButton@BUILDING:
|
ProductionTypeButton@BUILDING:
|
||||||
Key: e
|
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
VisualHeight: 0
|
VisualHeight: 0
|
||||||
@@ -266,13 +265,13 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Buildings
|
TooltipText: Buildings
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Building
|
ProductionGroup: Building
|
||||||
|
HotkeyName: ProductionTypeBuildingKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
Y: 5
|
Y: 5
|
||||||
ImageCollection: production-icons
|
ImageCollection: production-icons
|
||||||
ProductionTypeButton@INFANTRY:
|
ProductionTypeButton@INFANTRY:
|
||||||
Key: t
|
|
||||||
Y: 31
|
Y: 31
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
@@ -281,13 +280,13 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Infantry
|
TooltipText: Infantry
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Infantry
|
ProductionGroup: Infantry
|
||||||
|
HotkeyName: ProductionTypeInfantryKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
Y: 5
|
Y: 5
|
||||||
ImageCollection: production-icons
|
ImageCollection: production-icons
|
||||||
ProductionTypeButton@VEHICLE:
|
ProductionTypeButton@VEHICLE:
|
||||||
Key: y
|
|
||||||
Y: 62
|
Y: 62
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
@@ -296,13 +295,13 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Vehicles
|
TooltipText: Vehicles
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Vehicle
|
ProductionGroup: Vehicle
|
||||||
|
HotkeyName: ProductionTypeVehicleKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
Y: 5
|
Y: 5
|
||||||
ImageCollection: production-icons
|
ImageCollection: production-icons
|
||||||
ProductionTypeButton@TANKS:
|
ProductionTypeButton@TANKS:
|
||||||
Key: y
|
|
||||||
Y: 93
|
Y: 93
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
@@ -311,13 +310,13 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Tanks
|
TooltipText: Tanks
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Armor
|
ProductionGroup: Armor
|
||||||
|
HotkeyName: ProductionTypeTankKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
Y: 5
|
Y: 5
|
||||||
ImageCollection: production-icons
|
ImageCollection: production-icons
|
||||||
ProductionTypeButton@AIRCRAFT:
|
ProductionTypeButton@AIRCRAFT:
|
||||||
Key: y
|
|
||||||
Y: 124
|
Y: 124
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
@@ -326,13 +325,13 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Aircraft
|
TooltipText: Aircraft
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Aircraft
|
ProductionGroup: Aircraft
|
||||||
|
HotkeyName: ProductionTypeAircraftKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
Y: 5
|
Y: 5
|
||||||
ImageCollection: production-icons
|
ImageCollection: production-icons
|
||||||
ProductionTypeButton@STARPORT:
|
ProductionTypeButton@STARPORT:
|
||||||
Key: y
|
|
||||||
Y: 155
|
Y: 155
|
||||||
Width: 25
|
Width: 25
|
||||||
Height: 25
|
Height: 25
|
||||||
@@ -341,6 +340,7 @@ Container@PLAYER_WIDGETS:
|
|||||||
TooltipText: Starport
|
TooltipText: Starport
|
||||||
TooltipContainer: TOOLTIP_CONTAINER
|
TooltipContainer: TOOLTIP_CONTAINER
|
||||||
ProductionGroup: Starport
|
ProductionGroup: Starport
|
||||||
|
HotkeyName: ProductionTypeMerchantKey
|
||||||
Children:
|
Children:
|
||||||
Image@ICON:
|
Image@ICON:
|
||||||
X: 5
|
X: 5
|
||||||
|
|||||||
Reference in New Issue
Block a user