Add the Oil Derrick count to the economy statistics

OpenRA · Sep 1, 2019 · c33d994 · c33d994
1 parent 9472b9c
commit c33d994
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 4 deletions.
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
@@ -360,6 +360,10 @@ ScrollItemWidget EconomyStats(Player player)
 			var harvesters = template.Get<LabelWidget>("HARVESTERS");
 			harvesters.GetText = () => world.ActorsHavingTrait<Harvester>().Count(a => a.Owner == player && !a.IsDead).ToString();
 
+			var cashTricklers = template.GetOrNull<LabelWidget>("DERRICKS");
+			if (cashTricklers != null)
+				cashTricklers.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();
+
 			return template;
 		}
 

diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
@@ -397,7 +397,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 845
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -476,6 +476,14 @@ Container@OBSERVER_WIDGETS:
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@DERRICKS_HEADER:
+									X: 760
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Oil Derricks
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -773,7 +781,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 845
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -850,6 +858,13 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
+								Label@DERRICKS:
+									X: 760
+									Y: 0
+									Width: 80
+									Height: PARENT_BOTTOM
+									Align: Right
+									Shadow: True
 						ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0

diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
@@ -18,6 +18,7 @@ V19:
 		ValidStances: Neutral, Enemy
 	SpawnActorOnDeath:
 		Actor: V19.Husk
+	UpdatesDerrickCount:
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk

diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml
@@ -333,7 +333,7 @@ Container@OBSERVER_WIDGETS:
 						Container@ECONOMY_STATS_HEADERS:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 845
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -412,6 +412,14 @@ Container@OBSERVER_WIDGETS:
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@DERRICKS_HEADER:
+									X: 760
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Oil Derricks
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -711,7 +719,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 845
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -788,6 +796,13 @@ Container@OBSERVER_WIDGETS:
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
+								Label@DERRICKS:
+									X: 760
+									Y: 0
+									Width: 80
+									Height: PARENT_BOTTOM
+									Align: Right
+									Shadow: True
 						ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0

diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
@@ -504,6 +504,7 @@ OILB:
 	AppearsOnMapPreview:
 	GivesCashOnCapture:
 		Amount: 100
+	UpdatesDerrickCount:
 
 BR1:
 	Inherits: ^Bridge