Add Upgrade production queue to D2k

This commit is contained in:
OmegaBolt
2015-05-08 23:54:08 +03:00
committed by penev92
parent 28e1eccf29
commit f3ec07d4e4
7 changed files with 42 additions and 13 deletions

View File

@@ -211,6 +211,7 @@ namespace OpenRA
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 ProductionTypeUpgradeKey = new Hotkey(Keycode.R, Modifiers.None);
public Hotkey SupportPower01Key = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
public Hotkey SupportPower02Key = new Hotkey(Keycode.UNKNOWN, Modifiers.None);

View File

@@ -425,7 +425,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ "ProductionTypeAircraftKey", "Aircraft Tab" },
{ "ProductionTypeNavalKey", "Naval Tab" },
{ "ProductionTypeTankKey", "Tank Tab" },
{ "ProductionTypeMerchantKey", "Starport Tab" }
{ "ProductionTypeMerchantKey", "Starport Tab" },
{ "ProductionTypeUpgradeKey", "Upgrade Tab" }
};
for (var i = 1; i <= 24; i++)

View File

@@ -37,6 +37,7 @@ Speech:
EnemyUnitsDetected: ENEMY_DETECTED
UnitRepaired: GANEW
CannotDeploy: DPLOY
Upgrading: UPGRD
Sounds:
DefaultVariant: .WAV

View File

@@ -45,6 +45,9 @@ production-icons: chrome.png
building: 430,0,16,16
building-disabled: 446,0,16,16
building-alert: 462,0,16,16
upgrade: 430,224,16,16
upgrade-disabled: 446,224,16,16
upgrade-alert: 462,224,16,16
infantry: 430,32,16,16
infantry-disabled: 446,32,16,16
infantry-alert: 462,32,16,16

View File

@@ -243,7 +243,7 @@ Container@PLAYER_WIDGETS:
IconSize: 58, 48
IconMargin: 2, 0
IconSpriteOffset: 0, 0
MinimumRows: 4
MinimumRows: 5
MaximumRows: 6
Container@PALETTE_FOREGROUND:
X: 64
@@ -259,7 +259,7 @@ Container@PLAYER_WIDGETS:
X: 6
Y: 2
Width: 25
Height: 243
Height: 274
Children:
ProductionTypeButton@BUILDING:
Width: 25
@@ -275,12 +275,27 @@ Container@PLAYER_WIDGETS:
X: 5
Y: 5
ImageCollection: production-icons
ProductionTypeButton@INFANTRY:
ProductionTypeButton@UPGRADE:
Y: 31
Width: 25
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Upgrades
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Upgrade
HotkeyName: ProductionTypeUpgradeKey
Children:
Image@ICON:
X: 5
Y: 5
ImageCollection: production-icons
ProductionTypeButton@INFANTRY:
Y: 62
Width: 25
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Infantry
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Infantry
@@ -291,12 +306,12 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: production-icons
ProductionTypeButton@VEHICLE:
Y: 62
Y: 93
Width: 25
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Vehicles
TooltipText: Light Vehicles
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Vehicle
HotkeyName: ProductionTypeVehicleKey
@@ -306,12 +321,12 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: production-icons
ProductionTypeButton@TANKS:
Y: 93
Y: 124
Width: 25
Height: 25
VisualHeight: 0
Background: sidebar-button
TooltipText: Tanks
TooltipText: Heavy Vehicles
TooltipContainer: TOOLTIP_CONTAINER
ProductionGroup: Armor
HotkeyName: ProductionTypeTankKey
@@ -321,7 +336,7 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: production-icons
ProductionTypeButton@AIRCRAFT:
Y: 124
Y: 155
Width: 25
Height: 25
VisualHeight: 0
@@ -336,7 +351,7 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: production-icons
ProductionTypeButton@STARPORT:
Y: 155
Y: 186
Width: 25
Height: 25
VisualHeight: 0
@@ -351,7 +366,7 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: production-icons
Button@SCROLL_UP_BUTTON:
Y: 186
Y: 217
Width: 25
Height: 25
VisualHeight: 0
@@ -365,7 +380,7 @@ Container@PLAYER_WIDGETS:
ImageCollection: scrollbar
ImageName: up_arrow
Button@SCROLL_DOWN_BUTTON:
Y: 217
Y: 248
Width: 25
Height: 25
VisualHeight: 0

View File

@@ -6,6 +6,12 @@ Player:
QueuedAudio: Building
ReadyAudio: BuildingReady
BlockedAudio: NoRoom
ClassicProductionQueue@Upgrade:
Type: Upgrade
LowPowerSlowdown: 3
QueuedAudio: Upgrading
ReadyAudio: NewOptions
BlockedAudio: NoRoom
ClassicProductionQueue@Infantry:
Type: Infantry
LowPowerSlowdown: 2

View File

@@ -52,7 +52,9 @@ conyard:
RevealsShroud:
Range: 10c0
Production:
Produces: Building
Produces: Building, Upgrade
MoveIntoWorld: false
Exit:
Valued:
Cost: 2000
Tooltip: