epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the observer ui

Browse Source
This commit is contained in:
teinarss
2019-05-22 14:56:52 +02:00
committed by Paul Chote
parent b90b3095a6
commit 9fc8b829e4
23 changed files with 3773 additions and 2076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ra/chrome.yaml
View File

@@ -1043,6 +1043,8 @@ scrollheader-selected: dialog.png
corner-bl: 512,127,1,1
corner-br: 639,127,1,1
scrollitem-nohover: dialog.png
logos: loadscreen.png
logo: 0,0,256,256
@@ -1061,4 +1063,4 @@ mainmenu-border: dialog.png
dropdown: dialog.png
separator: 512,1,1,19
observer-separator: 768,256,1,19
observer-separator: 768,256,1,19

886
mods/ra/chrome/ingame-observer.yaml
View File

@@ -31,34 +31,10 @@ Container@OBSERVER_WIDGETS:
TooltipTemplate: SIMPLE_TOOLTIP
Container@TOP_BUTTONS:
Logic: MenuButtonsChromeLogic
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
X: 9
Y: 7
Children:
LogicKeyListener@OBSERVER_KEY_LISTENER:
MenuButton@OBSERVER_STATS_BUTTON:
Key: StatisticsBasic
MenuContainer: INGAME_OBSERVERSTATS_BG
HideIngameUI: false
Pause: false
X: 160
Width: 28
Height: 28
Background: sidebar-button-observer
TooltipText: Statistics
TooltipContainer: TOOLTIP_CONTAINER
VisualHeight: 0
Children:
Image@ICON:
X: 6
Y: 6
ImageCollection: order-icons
ImageName: stats
MenuButton@OPTIONS_BUTTON:
Key: escape
X: 192
@@ -221,3 +197,865 @@ Container@OBSERVER_WIDGETS:
VisualHeight: 0
Text: MAX
Font: TinyBold
Container@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
StatisticsNoneKey: StatisticsNone
StatisticsBasicKey: StatisticsBasic
StatisticsEconomyKey: StatisticsEconomy
StatisticsProductionKey: StatisticsProduction
StatisticsSupportPowersKey: StatisticsSupportPowers
StatisticsCombatKey: StatisticsCombat
StatisticsGraphKey: StatisticsGraph
StatisticsArmyGraphKey: StatisticsArmyGraph
StatsDropDownPanelTemplate: SPECTATOR_LABEL_DROPDOWN_TEMPLATE
X: 5
Y: 5
Width: 765
Height: 240
Children:
DropDownButton@STATS_DROPDOWN:
X: 0
Y: 0
Width: 185
Height: 25
Font: Bold
Background: observer-scrollpanel-button
SeparatorImage: observer-separator
Children:
LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
Container@GRAPH_BG:
Y: 30
X: 0
Width: PARENT_RIGHT
Height: 24
Children:
Container@BASIC_STATS_HEADERS:
X: 0
Y: 0
Width: 765
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@CASH_HEADER:
X: 160
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Cash
Align: Right
Shadow: True
Label@EARNED_MIN_HEADER:
X: 240
Y: 0
Width: 60
Height: PARENT_BOTTOM
Font: Bold
Text: $/min
Align: Right
Shadow: True
Label@POWER_HEADER:
X: 300
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Power
Align: Center
Shadow: True
Label@KILLS_HEADER:
X: 380
Y: 0
Width: 40
Height: PARENT_BOTTOM
Font: Bold
Text: Kills
Align: Right
Shadow: True
Label@DEATHS_HEADER:
X: 420
Y: 0
Width: 60
Height: PARENT_BOTTOM
Font: Bold
Text: Deaths
Align: Right
Shadow: True
Label@ASSETS_DESTROYED_HEADER:
X: 480
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Destroyed
Align: Right
Shadow: True
Label@ASSETS_LOST_HEADER:
X: 560
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Lost
Align: Right
Shadow: True
Label@EXPERIENCE_HEADER:
X: 640
Y: 0
Width: 60
Height: PARENT_BOTTOM
Font: Bold
Text: Score
Align: Right
Shadow: True
Label@ACTIONS_MIN_HEADER:
X: 700
Y: 0
Width: 60
Height: PARENT_BOTTOM
Font: Bold
Text: APM
Align: Right
Shadow: True
Container@ECONOMY_STATS_HEADERS:
X: 0
Y: 0
Width: 745
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Shadow: True
Label@CASH_HEADER:
X: 160
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Cash
Align: Right
Shadow: True
Label@EARNED_MIN_HEADER:
X: 240
Width: 60
Height: PARENT_BOTTOM
Font: Bold
Text: $/min
Align: Right
Shadow: True
Label@EARNED_THIS_MIN_HEADER:
X: 300
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Earned this min
Align: Right
Shadow: True
Label@ASSETS_HEADER:
X: 420
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Assets
Align: Right
Shadow: True
Label@EARNED_HEADER:
X: 500
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Earned
Align: Right
Shadow: True
Label@SPENT_HEADER:
X: 580
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Spent
Align: Right
Shadow: True
Label@HARVESTERS_HEADER:
X: 660
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Harvesters
Align: Right
Shadow: True
Container@PRODUCTION_STATS_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@PRODUCTION_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Production
Shadow: True
Container@SUPPORT_POWERS_HEADERS:
X: 0
Y: 0
Width: 400
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@SUPPORT_POWERS_HEADER:
X: 160
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Support Powers
Shadow: True
Container@COMBAT_STATS_HEADERS:
X: 0
Y: 0
Width: 775
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@PLAYER_HEADER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Player
Align: Left
Shadow: True
Label@ASSETS_DESTROYED_HEADER:
X: 160
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Destroyed
Align: Right
Shadow: True
Label@ASSETS_LOST_HEADER:
X: 240
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Lost
Align: Right
Shadow: True
Label@UNITS_KILLED_HEADER:
X: 320
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Units Killed
Align: Right
Shadow: True
Label@UNITS_DEAD_HEADER:
X: 420
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Units Lost
Align: Right
Shadow: True
Label@BUILDINGS_KILLED_HEADER:
X: 500
Y: 0
Width: 90
Height: PARENT_BOTTOM
Font: Bold
Text: Bldg Killed
Align: Right
Shadow: True
Label@BUILDINGS_DEAD_HEADER:
X: 590
Y: 0
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Bldg Lost
Align: Right
Shadow: True
Label@ARMY_VALUE_HEADER:
X: 670
Y: 0
Width: 100
Height: PARENT_BOTTOM
Font: Bold
Text: Army Value
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_HEADERS:
X: 0
Y: 0
Width: PARENT_RIGHT - 25
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@EARNED_THIS_MIN_HEADER:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Font: Bold
Text: Earnings received each minute
Align: Center
Shadow: True
Container@ARMY_THIS_MIN_GRAPH_HEADERS:
X: 0
Y: 0
Width: PARENT_RIGHT - 25
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@HEADER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@EARNED_THIS_MIN_HEADER:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Font: Bold
Text: Army value over time
Align: Center
Shadow: True
ScrollPanel@PLAYER_STATS_PANEL:
X: 0
Y: 54
Width: PARENT_RIGHT
Height: 240
TopBottomSpacing: 0
BorderWidth: 0
Background:
ScrollBarBackground: observer-scrollpanel-button
Button: observer-scrollpanel-button
ScrollbarWidth: 24
ScrollBar: Hidden
Children:
ScrollItem@TEAM_TEMPLATE:
X: 0
Y: 0
Width: 650 #PARENT_RIGHT - 35
Height: 24
Children:
ColorBlock@TEAM_COLOR:
X: 0
Y: 0
Color: 00000090
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@TEAM_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
TopLeftColor: 00000090
BottomLeftColor: 00000090
Width: 200
Height: PARENT_BOTTOM
Label@TEAM:
X: 10
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ScrollItem@BASIC_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 765
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 160
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_MIN:
X: 240
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@POWER:
X: 300
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Center
Shadow: True
Label@KILLS:
X: 380
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 420
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 480
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 560
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 640
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 700
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 745
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 160
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_MIN:
X: 240
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_THIS_MIN:
X: 300
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS:
X: 420
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED:
X: 500
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@SPENT:
X: 580
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@HARVESTERS:
X: 660
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 160
Y: 0
Width: 0
Height: PARENT_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
ScrollItem@SUPPORT_POWERS_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 400
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverSupportPowerIcons@SUPPORT_POWER_ICONS:
X: 160
Y: 0
Width: 0
Height: PARENT_BOTTOM
ScrollItem@COMBAT_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 775
Height: 24
BaseName: scrollitem-nohover
Children:
ColorBlock@PLAYER_COLOR:
X: 0
Y: 0
Width: PARENT_RIGHT - 200
Height: PARENT_BOTTOM
GradientColorBlock@PLAYER_GRADIENT:
X: PARENT_RIGHT - 200
Y: 0
Width: 200
Height: PARENT_BOTTOM
Image@FLAG:
X: 5
Y: 4
Width: 35
Height: PARENT_BOTTOM - 4
ImageName: random
ImageCollection: flags
Label@PLAYER:
X: 40
Y: 0
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 160
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 240
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_KILLED:
X: 320
Y: 0
Width: 100
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 420
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 500
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 590
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ARMY_VALUE:
X: 670
Y: 0
Width: 100
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_CONTAINER:
X: 0
Y: 54
Width: PARENT_RIGHT - 25
Height: PARENT_BOTTOM - 65
Visible: False
Children:
ColorBlock@GRAPH_BACKGROUND:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Color: 00000090
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
Container@ARMY_THIS_MIN_GRAPH_CONTAINER:
X: 0
Y: 54
Width: PARENT_RIGHT - 25
Height: PARENT_BOTTOM - 65
Visible: False
Children:
ColorBlock@GRAPH_BACKGROUND:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Color: 00000090
LineGraph@ARMY_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

1
mods/ra/mod.yaml
View File

@@ -91,7 +91,6 @@ ChromeLayout:
common|chrome/ingame-infostats.yaml
common|chrome/ingame-menu.yaml
ra|chrome/ingame-observer.yaml
common|chrome/ingame-observerstats.yaml
ra|chrome/ingame-player.yaml
common|chrome/ingame-perf.yaml
common|chrome/ingame-debug.yaml