Updated the observer ui

2019-05-22 14:56:52 +02:00
parent b90b3095a6
commit 9fc8b829e4
23 changed files with 3773 additions and 2076 deletions
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -445,6 +445,9 @@ scrollitem-selected: chrome.png
 	corner-bl: 128,63,1,1
 	corner-br: 159,63,1,1

+scrollitem-nohover: chrome.png
+
+
 #
 # Slider
 # ===
--- a/mods/cnc/chrome/ingame-observerstats.yaml
+++ b/mods/cnc/chrome/ingame-observerstats.yaml
@@ -1,610 +0,0 @@
-Background@INGAME_OBSERVERSTATS_BG:
-	Logic: ObserverStatsLogic
-		StatisticsBasicKey: StatisticsBasic
-		StatisticsEconomyKey: StatisticsEconomy
-		StatisticsProductionKey: StatisticsProduction
-		StatisticsCombatKey: StatisticsCombat
-		StatisticsGraphKey: StatisticsGraph
-		StatisticsArmyGraphKey: StatisticsArmyGraph
-	X: (WINDOW_RIGHT - WIDTH) / 2
-	Y: (WINDOW_BOTTOM - HEIGHT) / 2
-	Width: 1005
-	Height: 500
-	Children:
-		Background@BACKGROUND:
-			Width: PARENT_RIGHT
-			Background: panel-black
-			Height: PARENT_BOTTOM - 35
-			Children:
-				Label@TITLE:
-					X: 0
-					Y: 0 - 25
-					Width: PARENT_RIGHT
-					Font: BigBold
-					Align: Center
-					Contrast: True
-					Text: Statistics
-				DropDownButton@STATS_DROPDOWN:
-					X: PARENT_RIGHT - 200
-					Y: 15
-					Width: 185
-					Height: 25
-					Font: Bold
-					Children:
-						LogicKeyListener@STATS_DROPDOWN_KEYHANDLER:
-				Container@BASIC_STATS_HEADERS:
-					X: 0
-					Y: 0
-					Width: PARENT_RIGHT
-					Height: PARENT_BOTTOM
-					Children:
-						Label@PLAYER_HEADER:
-							X: 75
-							Y: 40
-							Width: 160
-							Height: 25
-							Font: Bold
-							Text: Player
-						Label@CASH_HEADER:
-							X: 235
-							Y: 40
-							Width: 80
-							Height: 25
-							Font: Bold
-							Text: Cash
-						Label@EARNED_MIN_HEADER:
-							X: 315
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Earned/min
-						Label@POWER_HEADER:
-							X: 415
-							Y: 40
-							Width: 80
-							Height: 25
-							Font: Bold
-							Text: Power
-						Label@KILLS_HEADER:
-							X: 475
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Kills
-							Align: Right
-						Label@DEATHS_HEADER:
-							X: 535
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Deaths
-							Align: Right
-						Label@ASSETS_DESTROYED_HEADER:
-							X: 595
-							Y: 40
-							Width: 80
-							Height: 25
-							Font: Bold
-							Text: Destroyed
-							Align: Right
-						Label@ASSETS_LOST_HEADER:
-							X: 675
-							Y: 40
-							Width: 80
-							Height: 25
-							Font: Bold
-							Text: Lost
-							Align: Right
-						Label@EXPERIENCE_HEADER:
-							X: 755
-							Y: 40
-							Width: 94
-							Height: 25
-							Font: Bold
-							Text: Score
-							Align: Right
-						Label@ACTIONS_MIN_HEADER:
-							X: 850
-							Y: 40
-							Width: 90
-							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: 75
-							Y: 40
-							Width: 160
-							Height: 25
-							Font: Bold
-							Text: Player
-						Label@CASH_HEADER:
-							X: 235
-							Y: 40
-							Width: 80
-							Height: 25
-							Font: Bold
-							Text: Cash
-						Label@EARNED_MIN_HEADER:
-							X: 315
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Earned/min
-						Label@EARNED_THIS_MIN_HEADER:
-							X: 415
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Earned this min
-						Label@ASSETS_HEADER:
-							X: 555
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Assets
-						Label@EARNED_HEADER:
-							X: 635
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Earned
-						Label@SPENT_HEADER:
-							X: 715
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Spent
-						Label@HARVESTERS_HEADER:
-							X: 795
-							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: 75
-							Y: 40
-							Width: 160
-							Height: 25
-							Font: Bold
-							Text: Player
-						Label@PRODUCTION_HEADER:
-							X: 235
-							Y: 40
-							Width: 320
-							Height: 25
-							Font: Bold
-							Text: Production
-						Label@SUPPORT_POWERS_HEADER:
-							X: 555
-							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: 75
-							Y: 40
-							Width: 160
-							Height: 25
-							Font: Bold
-							Text: Player
-						Label@ASSETS_DESTROYED_HEADER:
-							X: 230
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Destroyed
-						Label@ASSETS_LOST_HEADER:
-							X: 325
-							Y: 40
-							Width: 60
-							Height: 25
-							Font: Bold
-							Text: Lost
-						Label@UNITS_KILLED_HEADER:
-							X: 415
-							Y: 40
-							Width: 40
-							Height: 25
-							Font: Bold
-							Text: Units Killed
-							Align: Right
-						Label@UNITS_DEAD_HEADER:
-							X: 515
-							Y: 40
-							Width: 40
-							Height: 25
-							Font: Bold
-							Text: Units Lost
-							Align: Right
-						Label@BUILDINGS_KILLED_HEADER:
-							X: 635
-							Y: 40
-							Width: 40
-							Height: 25
-							Font: Bold
-							Text: Bldg Killed
-							Align: Right
-						Label@BUILDINGS_DEAD_HEADER:
-							X: 735
-							Y: 40
-							Width: 40
-							Height: 25
-							Font: Bold
-							Text: Bldg Lost
-							Align: Right
-						Label@ARMY_VALUE_HEADER:
-							X: 835
-							Y: 40
-							Width: 40
-							Height: 25
-							Font: Bold
-							Text: Army Value
-							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
-				Container@ARMY_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: Army value over time
-							Align: Center
-				ScrollPanel@PLAYER_STATS_PANEL:
-					X: 15
-					Y: 70
-					Width: PARENT_RIGHT - 30
-					Height: PARENT_BOTTOM - 35 - 50
-					TopBottomSpacing: 5
-					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
-									Shadow: True
-								Label@CASH:
-									X: 215
-									Y: 0
-									Width: 80
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@EARNED_MIN:
-									X: 295
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@POWER:
-									X: 395
-									Y: 0
-									Width: 80
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@KILLS:
-									X: 455
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@DEATHS:
-									X: 515
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@ASSETS_DESTROYED:
-									X: 575
-									Y: 0
-									Width: 80
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@ASSETS_LOST:
-									X: 655
-									Y: 0
-									Width: 80
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@EXPERIENCE:
-									X: 735
-									Y: 0
-									Width: 95
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@ACTIONS_MIN:
-									X: 830
-									Y: 0
-									Width: 90
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-						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
-									Shadow: True
-								Label@CASH:
-									X: 215
-									Y: 0
-									Width: 80
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@EARNED_MIN:
-									X: 295
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@EARNED_THIS_MIN:
-									X: 395
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@ASSETS:
-									X: 535
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@EARNED:
-									X: 615
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@SPENT:
-									X: 695
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@HARVESTERS:
-									X: 775
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-						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
-									Shadow: True
-								ObserverProductionIcons@PRODUCTION_ICONS:
-									X: 215
-									Y: 0
-									Width: 320
-									Height: PARENT_BOTTOM
-									TooltipContainer: TOOLTIP_CONTAINER
-								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
-									Shadow: True
-								Label@ASSETS_DESTROYED:
-									X: 215
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@ASSETS_LOST:
-									X: 295
-									Y: 0
-									Width: 60
-									Height: PARENT_BOTTOM
-									Shadow: True
-								Label@UNITS_KILLED:
-									X: 395
-									Y: 0
-									Width: 40
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@UNITS_DEAD:
-									X: 495
-									Y: 0
-									Width: 40
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@BUILDINGS_KILLED:
-									X: 615
-									Y: 0
-									Width: 40
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@BUILDINGS_DEAD:
-									X: 715
-									Y: 0
-									Width: 40
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-								Label@ARMY_VALUE:
-									X: 815
-									Y: 0
-									Width: 40
-									Height: PARENT_BOTTOM
-									Align: Right
-									Shadow: True
-						Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
-							X: 10
-							Y: 10
-							Width: PARENT_RIGHT - 100
-							Height: PARENT_BOTTOM - 60
-							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
-						Container@ARMY_THIS_MIN_GRAPH_TEMPLATE:
-							X: 10
-							Y: 10
-							Width: PARENT_RIGHT - 100
-							Height: PARENT_BOTTOM - 60
-							Children:
-								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
-		Button@CLOSE:
-			X: 0
-			Y: PARENT_BOTTOM - 36
-			Width: 140
-			Height: 35
-			Text: Close
-			Key: escape
-			Font: Bold
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -71,12 +71,6 @@ Container@PERF_WIDGETS:

 Container@OBSERVER_WIDGETS:
 	Logic: MenuButtonsChromeLogic
-		StatisticsBasicKey: StatisticsBasic
-		StatisticsEconomyKey: StatisticsEconomy
-		StatisticsProductionKey: StatisticsProduction
-		StatisticsCombatKey: StatisticsCombat
-		StatisticsGraphKey: StatisticsGraph
-		StatisticsArmyGraphKey: StatisticsArmyGraph
 	Children:
 		ViewportController:
 			Width: WINDOW_RIGHT
@@ -130,23 +124,6 @@ Container@OBSERVER_WIDGETS:
 					Y: 5
 					ImageCollection: order-icons
 					ImageName: options
-		MenuButton@OBSERVER_STATS_BUTTON:
-			Key: StatisticsBasic
-			X: WINDOW_RIGHT - 260 - WIDTH
-			Y: 35
-			Width: 30
-			Height: 25
-			TooltipText: Statistics
-			TooltipContainer: TOOLTIP_CONTAINER
-			MenuContainer: INGAME_OBSERVERSTATS_BG
-			HideIngameUI: false
-			Pause: false
-			Children:
-				Image@ICON:
-					X: 7
-					Y: 5
-					ImageCollection: order-icons
-					ImageName: stats
 		Background@RADAR:
 			X: WINDOW_RIGHT - WIDTH - 5
 			Y: 5
@@ -282,6 +259,863 @@ Container@OBSERVER_WIDGETS:
 					Width: PARENT_RIGHT
 					Height: 25
 					Shadow: True
+		Container@INGAME_OBSERVERSTATS_BG:
+			Logic: ObserverStatsLogic
+				StatisticsNoneKey: StatisticsNone
+				StatisticsBasicKey: StatisticsBasic
+				StatisticsEconomyKey: StatisticsEconomy
+				StatisticsProductionKey: StatisticsProduction
+				StatisticsSupportPowersKey: StatisticsSupportPowers
+				StatisticsCombatKey: StatisticsCombat
+				StatisticsGraphKey: StatisticsGraph
+				StatisticsArmyGraphKey: StatisticsArmyGraph
+			X: 5
+			Y: 5
+			Width: 765
+			Height: 240
+			Children:
+				DropDownButton@STATS_DROPDOWN:
+					X: 0
+					Y: 0
+					Width: 185
+					Height: 25
+					Font: Bold
+					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:
+					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

 Container@PLAYER_WIDGETS:
 	Children:
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -119,7 +119,6 @@ ChromeLayout:
 	cnc|chrome/ingame-infoscripterror.yaml
 	cnc|chrome/ingame-infoobjectives.yaml
 	cnc|chrome/ingame-infostats.yaml
-	cnc|chrome/ingame-observerstats.yaml
 	cnc|chrome/ingame-debuginfo.yaml
 	cnc|chrome/music.yaml
 	cnc|chrome/settings.yaml