From 55cf40ec52afe95fe32fc39771b363791cf1543e Mon Sep 17 00:00:00 2001
From: Gustas <37534529+PunkPun@users.noreply.github.com>
Date: Mon, 19 Dec 2022 13:32:41 +0200
Subject: [PATCH] Added carryalls to spectator Economy statistics

---
 .../Logic/Ingame/ObserverStatsLogic.cs        |  4 ++++
 mods/d2k/chrome/ingame-observer.yaml          | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
index f5660c7540..6e08432cbe 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
@@ -448,6 +448,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var harvesters = template.Get<LabelWidget>("HARVESTERS");
 			harvesters.GetText = () => world.ActorsWithTrait<Harvester>().Count(a => a.Actor.Owner == player && !a.Actor.IsDead && !a.Trait.IsTraitDisabled).ToString();
 
+			var carryalls = template.GetOrNull<LabelWidget>("CARRYALLS");
+			if (carryalls != null)
+				carryalls.GetText = () => world.ActorsWithTrait<AutoCarryall>().Count(a => a.Actor.Owner == player && !a.Actor.IsDead).ToString();
+
 			var derricks = template.GetOrNull<LabelWidget>("DERRICKS");
 			if (derricks != null)
 				derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();
diff --git a/mods/d2k/chrome/ingame-observer.yaml b/mods/d2k/chrome/ingame-observer.yaml
index d981ce8b74..24d4c713a7 100644
--- a/mods/d2k/chrome/ingame-observer.yaml
+++ b/mods/d2k/chrome/ingame-observer.yaml
@@ -313,7 +313,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 640
+							Width: 720
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -384,6 +384,14 @@ Container@OBSERVER_WIDGETS:
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@CARRYALLS_HEADER:
+									X: 635
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Carryalls
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -717,7 +725,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 640
+							Width: 720
 							Height: 25
 							Background: scrollitem-nohover
 							Children:
@@ -785,6 +793,13 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
+								Label@CARRYALLS:
+									X: 635
+									Y: 0
+									Width: 80
+									Height: PARENT_BOTTOM
+									Align: Right
+									Shadow: True
 						ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0