Unify all mods on the C&C order button logic.

This commit is contained in:
Paul Chote
2014-03-21 19:10:46 +13:00
parent 255bfc70d1
commit 0bc3a68e9f
15 changed files with 148 additions and 217 deletions

View File

@@ -172,6 +172,7 @@ Container@PLAYER_WIDGETS:
ReadyText:Ready
HoldText:On Hold
Background@SIDEBAR_BACKGROUND:
Logic:OrderButtonsChromeLogic
X:WINDOW_RIGHT - 204
Y:30
Width:194

View File

@@ -237,20 +237,16 @@ strategic: strategic.png
enemy_owned: 32,32,32,32
player_owned: 96,0,32,32
sell-button: buttons.png
normal: 0,0,34,28
pressed: 34,0,34,28
disabled: 68,0,34,28
repair-button: buttons.png
normal: 0,28,34,28
pressed: 34,28,34,28
disabled: 68,28,34,28
power-button: buttons.png
normal: 0,56,34,28
pressed: 34,56,34,28
disabled: 68,56,34,28
order-icons: buttons.png
sell: 0,0,34,28
sell-disabled: 68,0,34,28
sell-active: 34,0,34,28
repair: 0,28,34,28
repair-disabled: 68,28,34,28
repair-active: 34,28,34,28
power: 0,56,34,28
power-disabled: 68,56,34,28
power-active: 34,56,34,28
music: musicplayer.png
pause: 0,0,25,25

View File

@@ -51,38 +51,41 @@ Container@PLAYER_WIDGETS:
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
Logic:OrderButtonsChromeLogic
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
Button@SELL_BUTTON:
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
Width:34
Height:28
TooltipText: Sell
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
Button@POWER_BUTTON:
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
Width:34
Height:28
TooltipText: Power Down
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
Button@REPAIR_BUTTON:
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
Width:34
Height:28
TooltipText: Repair
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25

View File

@@ -9,6 +9,22 @@ Background@SIMPLE_TOOLTIP:
Height:23
Font:Bold
Background@BUTTON_TOOLTIP:
Logic:ButtonTooltipLogic
Background:dialog3
Height:31
Children:
Label@LABEL:
X:5
Y:3
Height:23
Font:Bold
Label@HOTKEY:
Y:3
Height:23
TextColor:255,255,0
Font:Bold
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:dialog3

View File

@@ -181,20 +181,16 @@ strategic: strategic.png
enemy_owned: 32,32,32,32
player_owned: 96,0,32,32
sell-button: buttons.png
normal: 0,0,34,28
pressed: 34,0,34,28
disabled: 68,0,34,28
repair-button: buttons.png
normal: 0,28,34,28
pressed: 34,28,34,28
disabled: 68,28,34,28
power-button: buttons.png
normal: 0,56,34,28
pressed: 34,56,34,28
disabled: 68,56,34,28
order-icons: buttons.png
sell: 0,0,34,28
sell-disabled: 68,0,34,28
sell-active: 34,0,34,28
repair: 0,28,34,28
repair-disabled: 68,28,34,28
repair-active: 34,28,34,28
power: 0,56,34,28
power-disabled: 68,56,34,28
power-active: 34,56,34,28
flags: buttons.png
allies: 30,84,30,15

View File

@@ -51,38 +51,41 @@ Container@PLAYER_WIDGETS:
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
Logic:OrderButtonsChromeLogic
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Height:32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
Button@SELL_BUTTON:
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
Width:34
Height:28
TooltipText: Sell
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
Button@POWER_BUTTON:
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
Width:34
Height:28
TooltipText: Power Down
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
Button@REPAIR_BUTTON:
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
Width:34
Height:28
TooltipText: Repair
TooltipContainer:TOOLTIP_CONTAINER
VisualHeight:0
Children:
Image@ICON:
ImageCollection:order-icons
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25

View File

@@ -9,6 +9,22 @@ Background@SIMPLE_TOOLTIP:
Height:23
Font:Bold
Background@BUTTON_TOOLTIP:
Logic:ButtonTooltipLogic
Background:dialog4
Height:29
Children:
Label@LABEL:
X:7
Y:2
Height:23
Font:Bold
Label@HOTKEY:
Y:2
Height:23
TextColor:255,255,0
Font:Bold
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:dialog4

View File

@@ -175,20 +175,16 @@ strategic: strategic.png
enemy_owned: 32,32,32,32
player_owned: 96,0,32,32
sell-button: buttons.png
normal: 0,0,34,28
pressed: 34,0,34,28
disabled: 68,0,34,28
repair-button: buttons.png
normal: 0,28,34,28
pressed: 34,28,34,28
disabled: 68,28,34,28
power-button: buttons.png
normal: 0,56,34,28
pressed: 34,56,34,28
disabled: 68,56,34,28
order-icons: buttons.png
sell: 0,0,34,28
sell-disabled: 68,0,34,28
sell-active: 34,0,34,28
repair: 0,28,34,28
repair-disabled: 68,28,34,28
repair-active: 34,28,34,28
power: 0,56,34,28
power-disabled: 68,56,34,28
power-active: 34,56,34,28
flags: buttons.png
gdi: 30,84,30,15