Start moving towards saner RA widget logic. This switches players to observer mode after they have finished playing in RA/D2k and removes some legacy code.

This commit is contained in:
Scott_NZ
2013-04-21 18:34:48 +12:00
parent 7ec4bcad0e
commit ca80ac2d1f
35 changed files with 951 additions and 1290 deletions

View File

@@ -4,7 +4,7 @@ Background@CHEATS_PANEL:
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:350
Height:475
Visible:true
Visible:false
Children:
Label@LABEL_TITLE:
X:(PARENT_RIGHT - WIDTH)/2

View File

@@ -0,0 +1,52 @@
Background@INGAME_OPTIONS_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300
Height:295
Logic:IngameMenuLogic
Visible:false
Children:
Label@LABEL_TITLE:
X:(PARENT_RIGHT - WIDTH)/2
Y:20
Width:250
Height:25
Text:Options
Align:Center
Font:Bold
Button@RESUME:
X:(PARENT_RIGHT - WIDTH)/2
Y:60
Width:160
Height:25
Text:Resume
Font:Bold
Key:escape
Button@SETTINGS:
X:(PARENT_RIGHT - WIDTH)/2
Y:100
Width:160
Height:25
Text:Settings
Font:Bold
Button@MUSIC:
X:(PARENT_RIGHT - WIDTH)/2
Y:140
Width:160
Height:25
Text:Music
Font:Bold
Button@SURRENDER:
X:(PARENT_RIGHT - WIDTH)/2
Y:180
Width:160
Height:25
Text:Surrender
Font:Bold
Button@DISCONNECT:
X:(PARENT_RIGHT - WIDTH)/2
Y:220
Width:160
Height:25
Text:Abort Mission
Font:Bold

View File

@@ -0,0 +1,99 @@
Background@MISSION_OBJECTIVES:
Logic:MissionObjectivesLogic
X:25
Y:50
Width:512
Height:530
Visible:false
Background:dialog
Children:
Label@TITLE:
X:0
Y:15
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Text:Objectives
Label@PRIMARY_OBJECTIVE_HEADER:
X:40
Y:40
Width:300
Height:25
Font:Bold
Text:Primary Objectives
Label@PRIMARY_STATUS_HEADER:
X:350
Y:40
Width:122
Height:25
Font:Bold
Text:Status
ScrollPanel@PRIMARY_OBJECTIVES:
X:25
Y:70
Width:PARENT_RIGHT-50
Height:200
ItemSpacing:5
Children:
Container@PRIMARY_OBJECTIVE_TEMPLATE:
X:15
Y:0-15
Width:PARENT_RIGHT
Height:60
Children:
Label@PRIMARY_OBJECTIVE:
X:0
Y:0
Width:300
Height:PARENT_BOTTOM
Font:Regular
WordWrap:True
Label@PRIMARY_STATUS:
X:310
Y:0
Width:122
Height:PARENT_BOTTOM
Font:Bold
WordWrap:True
Label@SECONDARY_OBJECTIVE_HEADER:
X:40
Y:275
Width:300
Height:25
Font:Bold
Text:Secondary Objectives
Label@SECONDARY_STATUS_HEADER:
X:350
Y:275
Width:122
Height:25
Font:Bold
Text:Status
ScrollPanel@SECONDARY_OBJECTIVES:
X:25
Y:305
Width:PARENT_RIGHT-50
Height:200
ItemSpacing:5
Children:
Container@SECONDARY_OBJECTIVE_TEMPLATE:
X:15
Y:0-15
Width:PARENT_RIGHT
Height:60
Children:
Label@SECONDARY_OBJECTIVE:
X:0
Y:0
Width:300
Height:PARENT_BOTTOM
Font:Regular
WordWrap:True
Label@SECONDARY_STATUS:
X:310
Y:0
Width:122
Height:PARENT_BOTTOM
Font:Bold
WordWrap:True

View File

@@ -1,643 +0,0 @@
Container@OBSERVER_ROOT:
Visible:true
Logic:IngameObserverChromeLogic
Children:
WorldInteractionController@INTERACTION_CONTROLLER:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
ViewportScrollController:
X:0
Y:0
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
Timer@GAME_TIMER:
X: WINDOW_RIGHT/2
Y: 0-10
Background@POSTGAME_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400
Height:100
Background:dialog4
Visible:false
Children:
Label@TEXT:
X:(PARENT_RIGHT - WIDTH)/2
Y:0
Width:200
Height:80
Align:Center
Button@POSTGAME_OBSERVE:
X:10
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Observe
Button@POSTGAME_QUIT:
X:(PARENT_RIGHT - WIDTH - 10)
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Leave
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
Button@INGAME_OPTIONS_BUTTON:
X:0
Y:0
Width:160
Height:25
Text:Options (ESC)
Font:Bold
Key:escape
Button@INGAME_STATS_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Statistics (F1)
Font:Bold
Key:f1
Background@RADAR_BG:
X:WINDOW_RIGHT-255
Y:5
Width:250
Height:250
Children:
Radar@INGAME_RADAR:
X:10
Y:10
Width:PARENT_RIGHT-19
Height:PARENT_BOTTOM-19
WorldInteractionController:INTERACTION_CONTROLLER
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:WINDOW_RIGHT-250
Y:260
Width:240
Height:25
Font:Bold
Visible:true
WorldTooltip:
Background@INGAME_OPTIONS_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300
Height:295
Visible:false
Children:
Label@LABEL_TITLE:
X:(PARENT_RIGHT - WIDTH)/2
Y:20
Width:250
Height:25
Text:Options
Align:Center
Font:Bold
Button@RESUME:
X:(PARENT_RIGHT - WIDTH)/2
Y:60
Width:160
Height:25
Text:Resume
Font:Bold
Key:escape
Button@SETTINGS:
X:(PARENT_RIGHT - WIDTH)/2
Y:100
Width:160
Height:25
Text:Settings
Font:Bold
Button@MUSIC:
X:(PARENT_RIGHT - WIDTH)/2
Y:140
Width:160
Height:25
Text:Music
Font:Bold
Button@SURRENDER:
X:(PARENT_RIGHT - WIDTH)/2
Y:180
Width:160
Height:25
Text:Surrender
Font:Bold
Button@DISCONNECT:
X:(PARENT_RIGHT - WIDTH)/2
Y:220
Width:160
Height:25
Text:Abort Mission
Font:Bold
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Width:170
Height:40
Container@OBSERVER_STATS:
Logic:ObserverStatsLogic
X:25
Y:50
Width:950
Height:500
Visible:false
Children:
Background@BACKGROUND:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Background:dialog
Children:
Label@TITLE:
X:0
Y:15
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Text:Statistics
DropDownButton@STATS_DROPDOWN:
X:PARENT_RIGHT-200
Y:15
Width:185
Height:25
Font:Bold
Container@BASIC_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CASH_HEADER:
X:245
Y:40
Width:80
Height:25
Font:Bold
Text:Cash
Label@EARNED_MIN_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Earned/min
Label@POWER_HEADER:
X:425
Y:40
Width:80
Height:25
Font:Bold
Text:Power
Label@KILLS_HEADER:
X:505
Y:40
Width:40
Height:25
Font:Bold
Text:Kills
Align:Right
Label@DEATHS_HEADER:
X:565
Y:40
Width:40
Height:25
Font:Bold
Text:Deaths
Align:Right
Label@ACTIONS_MIN_HEADER:
X:665
Y:40
Width:40
Height:25
Font:Bold
Text:Actions/min
Align:Right
Container@ECONOMY_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CASH_HEADER:
X:245
Y:40
Width:80
Height:25
Font:Bold
Text:Cash
Label@EARNED_MIN_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Earned/min
Label@EARNED_THIS_MIN_HEADER:
X:425
Y:40
Width:60
Height:25
Font:Bold
Text:Earned this min
Label@ASSETS_HEADER:
X:565
Y:40
Width:60
Height:25
Font:Bold
Text:Assets
Label@EARNED_HEADER:
X:645
Y:40
Width:60
Height:25
Font:Bold
Text:Earned
Label@SPENT_HEADER:
X:725
Y:40
Width:60
Height:25
Font:Bold
Text:Spent
Label@HARVESTERS_HEADER:
X:805
Y:40
Width:60
Height:25
Font:Bold
Text:Harvesters
Align:Right
Container@PRODUCTION_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@PRODUCTION_HEADER:
X:245
Y:40
Width:320
Height:25
Font:Bold
Text:Production
Label@SUPPORT_POWERS_HEADER:
X:565
Y:40
Width:320
Height:25
Font:Bold
Text:Support Powers
Container@COMBAT_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CONTROL_HEADER:
X:245
Y:40
Width:60
Height:25
Font:Bold
Text:Control
Label@KILLS_COST_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Kills
Label@DEATHS_COST_HEADER:
X:405
Y:40
Width:60
Height:25
Font:Bold
Text:Deaths
Label@UNITS_KILLED_HEADER:
X:505
Y:40
Width:40
Height:25
Font:Bold
Text:Units Killed
Align:Right
Label@UNITS_DEAD_HEADER:
X:605
Y:40
Width:40
Height:25
Font:Bold
Text:Units Lost
Align:Right
Label@BUILDINGS_KILLED_HEADER:
X:725
Y:40
Width:40
Height:25
Font:Bold
Text:Bldg Killed
Align:Right
Label@BUILDINGS_DEAD_HEADER:
X:825
Y:40
Width:40
Height:25
Font:Bold
Text:Bldg Lost
Align:Right
Container@EARNED_THIS_MIN_GRAPH_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@EARNED_THIS_MIN_HEADER:
X:0
Y:40
Width:PARENT_RIGHT
Height:25
Font:Bold
Text:Earnings received each minute
Align:Center
ScrollPanel@PLAYER_STATS_PANEL:
X:25
Y:70
Width:PARENT_RIGHT-50
Height:PARENT_BOTTOM-45-50
ItemSpacing:5
Children:
ScrollItem@TEAM_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Label@TEAM:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Font:Bold
ScrollItem@BASIC_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CASH:
X:215
Y:0
Width:80
Height:PARENT_BOTTOM
Label@EARNED_MIN:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@POWER:
X:395
Y:0
Width:80
Height:PARENT_BOTTOM
Label@KILLS:
X:475
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@DEATHS:
X:535
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@ACTIONS_MIN:
X:635
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CASH:
X:215
Y:0
Width:80
Height:PARENT_BOTTOM
Label@EARNED_MIN:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@EARNED_THIS_MIN:
X:395
Y:0
Width:60
Height:PARENT_BOTTOM
Label@ASSETS:
X:535
Y:0
Width:60
Height:PARENT_BOTTOM
Label@EARNED:
X:615
Y:0
Width:60
Height:PARENT_BOTTOM
Label@SPENT:
X:695
Y:0
Width:60
Height:PARENT_BOTTOM
Label@HARVESTERS:
X:775
Y:0
Width:60
Height:PARENT_BOTTOM
Align:Right
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
ObserverProductionIcons@PRODUCTION_ICONS:
X:215
Y:0
Width:320
Height:PARENT_BOTTOM
ObserverSupportPowerIcons@SUPPORT_POWER_ICONS:
X:535
Y:0
Width:320
Height:PARENT_BOTTOM
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CONTROL:
X:215
Y:0
Width:60
Height:PARENT_BOTTOM
Label@KILLS_COST:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@DEATHS_COST:
X:375
Y:0
Width:60
Height:PARENT_BOTTOM
Label@UNITS_KILLED:
X:475
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@UNITS_DEAD:
X:575
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@BUILDINGS_KILLED:
X:695
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@BUILDINGS_DEAD:
X:795
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-100
Height:PARENT_BOTTOM-50
Children:
LineGraph@EARNED_THIS_MIN_GRAPH:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
ValueFormat:${0}
XAxisValueFormat:{0}
YAxisValueFormat:${0:F0}
XAxisSize:20
YAxisSize:10
XAxisLabel:m
YAxisLabel:$
LabelFont:TinyBold
AxisFont:Bold

View File

@@ -0,0 +1,488 @@
Container@OBSERVER_STATS:
Logic:ObserverStatsLogic
X:25
Y:50
Width:950
Height:500
Visible:false
Children:
Background@BACKGROUND:
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Background:dialog
Children:
Label@TITLE:
X:0
Y:15
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Text:Statistics
DropDownButton@STATS_DROPDOWN:
X:PARENT_RIGHT-200
Y:15
Width:185
Height:25
Font:Bold
Container@BASIC_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CASH_HEADER:
X:245
Y:40
Width:80
Height:25
Font:Bold
Text:Cash
Label@EARNED_MIN_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Earned/min
Label@POWER_HEADER:
X:425
Y:40
Width:80
Height:25
Font:Bold
Text:Power
Label@KILLS_HEADER:
X:505
Y:40
Width:40
Height:25
Font:Bold
Text:Kills
Align:Right
Label@DEATHS_HEADER:
X:565
Y:40
Width:40
Height:25
Font:Bold
Text:Deaths
Align:Right
Label@ACTIONS_MIN_HEADER:
X:665
Y:40
Width:40
Height:25
Font:Bold
Text:Actions/min
Align:Right
Container@ECONOMY_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CASH_HEADER:
X:245
Y:40
Width:80
Height:25
Font:Bold
Text:Cash
Label@EARNED_MIN_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Earned/min
Label@EARNED_THIS_MIN_HEADER:
X:425
Y:40
Width:60
Height:25
Font:Bold
Text:Earned this min
Label@ASSETS_HEADER:
X:565
Y:40
Width:60
Height:25
Font:Bold
Text:Assets
Label@EARNED_HEADER:
X:645
Y:40
Width:60
Height:25
Font:Bold
Text:Earned
Label@SPENT_HEADER:
X:725
Y:40
Width:60
Height:25
Font:Bold
Text:Spent
Label@HARVESTERS_HEADER:
X:805
Y:40
Width:60
Height:25
Font:Bold
Text:Harvesters
Align:Right
Container@PRODUCTION_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@PRODUCTION_HEADER:
X:245
Y:40
Width:320
Height:25
Font:Bold
Text:Production
Label@SUPPORT_POWERS_HEADER:
X:565
Y:40
Width:320
Height:25
Font:Bold
Text:Support Powers
Container@COMBAT_STATS_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@PLAYER_HEADER:
X:85
Y:40
Width:160
Height:25
Font:Bold
Text:Player
Label@CONTROL_HEADER:
X:245
Y:40
Width:60
Height:25
Font:Bold
Text:Control
Label@KILLS_COST_HEADER:
X:325
Y:40
Width:60
Height:25
Font:Bold
Text:Kills
Label@DEATHS_COST_HEADER:
X:405
Y:40
Width:60
Height:25
Font:Bold
Text:Deaths
Label@UNITS_KILLED_HEADER:
X:505
Y:40
Width:40
Height:25
Font:Bold
Text:Units Killed
Align:Right
Label@UNITS_DEAD_HEADER:
X:605
Y:40
Width:40
Height:25
Font:Bold
Text:Units Lost
Align:Right
Label@BUILDINGS_KILLED_HEADER:
X:725
Y:40
Width:40
Height:25
Font:Bold
Text:Bldg Killed
Align:Right
Label@BUILDINGS_DEAD_HEADER:
X:825
Y:40
Width:40
Height:25
Font:Bold
Text:Bldg Lost
Align:Right
Container@EARNED_THIS_MIN_GRAPH_HEADERS:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Children:
Label@EARNED_THIS_MIN_HEADER:
X:0
Y:40
Width:PARENT_RIGHT
Height:25
Font:Bold
Text:Earnings received each minute
Align:Center
ScrollPanel@PLAYER_STATS_PANEL:
X:25
Y:70
Width:PARENT_RIGHT-50
Height:PARENT_BOTTOM-45-50
ItemSpacing:5
Children:
ScrollItem@TEAM_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Label@TEAM:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
Font:Bold
ScrollItem@BASIC_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CASH:
X:215
Y:0
Width:80
Height:PARENT_BOTTOM
Label@EARNED_MIN:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@POWER:
X:395
Y:0
Width:80
Height:PARENT_BOTTOM
Label@KILLS:
X:475
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@DEATHS:
X:535
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@ACTIONS_MIN:
X:635
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CASH:
X:215
Y:0
Width:80
Height:PARENT_BOTTOM
Label@EARNED_MIN:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@EARNED_THIS_MIN:
X:395
Y:0
Width:60
Height:PARENT_BOTTOM
Label@ASSETS:
X:535
Y:0
Width:60
Height:PARENT_BOTTOM
Label@EARNED:
X:615
Y:0
Width:60
Height:PARENT_BOTTOM
Label@SPENT:
X:695
Y:0
Width:60
Height:PARENT_BOTTOM
Label@HARVESTERS:
X:775
Y:0
Width:60
Height:PARENT_BOTTOM
Align:Right
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
ObserverProductionIcons@PRODUCTION_ICONS:
X:215
Y:0
Width:320
Height:PARENT_BOTTOM
ObserverSupportPowerIcons@SUPPORT_POWER_ICONS:
X:535
Y:0
Width:320
Height:PARENT_BOTTOM
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-35
Height:25
Children:
Image@FLAG:
X:20
Y:5
Width:35
Height:PARENT_BOTTOM-5
ImageName:random
ImageCollection:flags
Label@PLAYER:
X:55
Y:0
Width:160
Height:PARENT_BOTTOM
Font:Bold
Label@CONTROL:
X:215
Y:0
Width:60
Height:PARENT_BOTTOM
Label@KILLS_COST:
X:295
Y:0
Width:60
Height:PARENT_BOTTOM
Label@DEATHS_COST:
X:375
Y:0
Width:60
Height:PARENT_BOTTOM
Label@UNITS_KILLED:
X:475
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@UNITS_DEAD:
X:575
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@BUILDINGS_KILLED:
X:695
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Label@BUILDINGS_DEAD:
X:795
Y:0
Width:40
Height:PARENT_BOTTOM
Align:Right
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X:0
Y:0
Width:PARENT_RIGHT-100
Height:PARENT_BOTTOM-50
Children:
LineGraph@EARNED_THIS_MIN_GRAPH:
X:0
Y:0
Width:PARENT_RIGHT
Height:PARENT_BOTTOM
ValueFormat:${0}
XAxisValueFormat:{0}
YAxisValueFormat:${0:F0}
XAxisSize:20
YAxisSize:10
XAxisLabel:m
YAxisLabel:$
LabelFont:TinyBold
AxisFont:Bold

View File

@@ -22,47 +22,7 @@ Container@INGAME_ROOT:
StrategicProgress@STRATEGIC_PROGRESS:
X: WINDOW_RIGHT/2
Y: 40
Background@POSTGAME_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:400
Height:100
Background:dialog4
Visible:false
Children:
Label@TEXT:
X:(PARENT_RIGHT - WIDTH)/2
Y:0
Width:200
Height:80
Align:Center
Button@POSTGAME_OBSERVE:
X:10
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Observe
Button@POSTGAME_QUIT:
X:(PARENT_RIGHT - WIDTH - 10)
Y:(PARENT_BOTTOM - HEIGHT - 10)
Width:150
Height:25
Font:Bold
Text:Leave
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
ReadyText: READY
HoldText: ON HOLD
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:250
Height:500
ReadyText: READY
HoldText: ON HOLD
RequiresText: Requires
Container@PLAYER_ROOT:
Button@INGAME_OPTIONS_BUTTON:
X:0
Y:0
@@ -71,6 +31,30 @@ Container@INGAME_ROOT:
Text:Options (ESC)
Font:Bold
Key: escape
WorldTooltip:
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Width:170
Height:40
Container@PLAYER_WIDGETS:
Children:
LogicTicker@WIN_LOSS_WATCHER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
@@ -133,58 +117,19 @@ Container@INGAME_ROOT:
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
WorldTooltip:
Background@INGAME_OPTIONS_BG:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:300
Height:295
Visible:false
Children:
Label@LABEL_TITLE:
X:(PARENT_RIGHT - WIDTH)/2
Y:20
Width:250
Height:25
Text:Options
Align:Center
Font:Bold
Button@RESUME:
X:(PARENT_RIGHT - WIDTH)/2
Y:60
Width:160
Height:25
Text:Resume
Font:Bold
Key:escape
Button@SETTINGS:
X:(PARENT_RIGHT - WIDTH)/2
Y:100
Width:160
Height:25
Text:Settings
Font:Bold
Button@MUSIC:
X:(PARENT_RIGHT - WIDTH)/2
Y:140
Width:160
Height:25
Text:Music
Font:Bold
Button@SURRENDER:
X:(PARENT_RIGHT - WIDTH)/2
Y:180
Width:160
Height:25
Text:Surrender
Font:Bold
Button@DISCONNECT:
X:(PARENT_RIGHT - WIDTH)/2
Y:220
Width:160
Height:25
Text:Abort Mission
Font:Bold
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
ReadyText: READY
HoldText: ON HOLD
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:250
Height:500
ReadyText: READY
HoldText: ON HOLD
RequiresText: Requires
Background@DIPLOMACY_BG:
Logic:DiplomacyLogic
X:(WINDOW_RIGHT - WIDTH)/2
@@ -209,22 +154,36 @@ Container@INGAME_ROOT:
Text:Close
Font:Bold
Key:escape
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Container@OBSERVER_WIDGETS:
Children:
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
Button@INGAME_STATS_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Statistics (F1)
Font:Bold
Key:f1
Background@RADAR_BG:
X:WINDOW_RIGHT-255
Y:5
Width:250
Height:250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Width:170
Height:40
Radar@INGAME_RADAR:
X:10
Y:10
Width:PARENT_RIGHT-19
Height:PARENT_BOTTOM-19
WorldInteractionController:INTERACTION_CONTROLLER
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:WINDOW_RIGHT-250
Y:260
Width:240
Height:25
Font:Bold

View File

@@ -1,4 +1,4 @@
Background@MAINMENU_BG:
Background@MAINMENU:
X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - HEIGHT)/2
Width:250

View File

@@ -1,102 +0,0 @@
Container@MISSION_OBJECTIVES:
Logic:MissionObjectivesLogic
X:25
Y:50
Width:512
Height:530
Children:
Background@BACKGROUND:
Width:512
Height:530
Background:dialog
Children:
Label@TITLE:
X:0
Y:15
Width:PARENT_RIGHT
Height:25
Font:Bold
Align:Center
Text:Objectives
Label@PRIMARY_OBJECTIVE_HEADER:
X:40
Y:40
Width:300
Height:25
Font:Bold
Text:Primary Objectives
Label@PRIMARY_STATUS_HEADER:
X:350
Y:40
Width:122
Height:25
Font:Bold
Text:Status
ScrollPanel@PRIMARY_OBJECTIVES:
X:25
Y:70
Width:PARENT_RIGHT-50
Height:200
ItemSpacing:5
Children:
Container@PRIMARY_OBJECTIVE_TEMPLATE:
X:15
Y:0-15
Width:PARENT_RIGHT
Height:60
Children:
Label@PRIMARY_OBJECTIVE:
X:0
Y:0
Width:300
Height:PARENT_BOTTOM
Font:Regular
WordWrap:True
Label@PRIMARY_STATUS:
X:310
Y:0
Width:122
Height:PARENT_BOTTOM
Font:Bold
WordWrap:True
Label@SECONDARY_OBJECTIVE_HEADER:
X:40
Y:275
Width:300
Height:25
Font:Bold
Text:Secondary Objectives
Label@SECONDARY_STATUS_HEADER:
X:350
Y:275
Width:122
Height:25
Font:Bold
Text:Status
ScrollPanel@SECONDARY_OBJECTIVES:
X:25
Y:305
Width:PARENT_RIGHT-50
Height:200
ItemSpacing:5
Children:
Container@SECONDARY_OBJECTIVE_TEMPLATE:
X:15
Y:0-15
Width:PARENT_RIGHT
Height:60
Children:
Label@SECONDARY_OBJECTIVE:
X:0
Y:0
Width:300
Height:PARENT_BOTTOM
Font:Regular
WordWrap:True
Label@SECONDARY_STATUS:
X:310
Y:0
Width:122
Height:PARENT_BOTTOM
Font:Bold
WordWrap:True

View File

@@ -1321,6 +1321,8 @@ Rules:
-SpawnMPUnits:
-MPStartLocations:
DesertShellmapScript:
LoadWidgetAtGameStart:
Widget: MAINMENU
TRAN.Husk2:
Burns:
Damage: 0

View File

@@ -1294,6 +1294,8 @@ Rules:
DefaultShellmapScript:
-SpawnMPUnits:
-MPStartLocations:
LoadWidgetAtGameStart:
Widget: MAINMENU
MSLO:
Building:
Power: 0

View File

@@ -56,8 +56,10 @@ ChromeLayout:
mods/ra/chrome/gameinit.yaml
mods/ra/chrome/ingame.yaml
mods/ra/chrome/ingame-chat.yaml
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-fmvplayer.yaml
mods/ra/chrome/ingame-menu.yaml
mods/ra/chrome/ingame-objectives.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/lobby.yaml
@@ -69,7 +71,6 @@ ChromeLayout:
mods/ra/chrome/dropdowns.yaml
mods/ra/chrome/modchooser.yaml
mods/ra/chrome/cheats.yaml
mods/ra/chrome/objectives.yaml
mods/ra/chrome/tooltips.yaml
Weapons:

View File

@@ -506,9 +506,8 @@ Player:
PlayerStatistics:
World:
OpenWidgetAtGameStart:
LoadWidgetAtGameStart:
Widget: INGAME_ROOT
ObserverWidget: OBSERVER_ROOT
ScreenShaker:
WaterPaletteRotation:
ExcludePalettes: player