Replaced "Earned this min" by an Oil Derrick count in the economy statistics

2019-09-01 00:42:31 +02:00
parent 1e6660ecb2
commit 912a424596
7 changed files with 76 additions and 101 deletions
--- 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: 715
 							Height: PARENT_BOTTOM
 							Children:
 								ColorBlock@HEADER_COLOR:
@@ -436,16 +436,8 @@ Container@OBSERVER_WIDGETS:
 									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
+									X: 300
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -453,7 +445,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@EARNED_HEADER:
-									X: 500
+									X: 380
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -461,7 +453,7 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@SPENT_HEADER:
-									X: 580
+									X: 460
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
@@ -469,13 +461,21 @@ Container@OBSERVER_WIDGETS:
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS_HEADER:
-									X: 660
+									X: 540
 									Width: 80
 									Height: PARENT_BOTTOM
 									Font: Bold
 									Text: Harvesters
 									Align: Right
 									Shadow: True
+								Label@DERRICKS_HEADER:
+									X: 630
+									Width: 80
+									Height: PARENT_BOTTOM
+									Font: Bold
+									Text: Oil Derricks
+									Align: Right
+									Shadow: True
 						Container@PRODUCTION_STATS_HEADERS:
 							X: 0
 							Y: 0
@@ -773,7 +773,7 @@ Container@OBSERVER_WIDGETS:
 						ScrollItem@ECONOMY_PLAYER_TEMPLATE:
 							X: 0
 							Y: 0
-							Width: 745
+							Width: 715
 							Height: 24
 							BaseName: scrollitem-nohover
 							Children:
@@ -815,36 +815,36 @@ Container@OBSERVER_WIDGETS:
 									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
+									X: 300
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@EARNED:
-									X: 500
+									X: 380
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@SPENT:
-									X: 580
+									X: 460
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
 									Align: Right
 									Shadow: True
 								Label@HARVESTERS:
-									X: 660
+									X: 540
+									Y: 0
+									Width: 80
+									Height: PARENT_BOTTOM
+									Align: Right
+									Shadow: True
+								Label@DERRICKS:
+									X: 630
 									Y: 0
 									Width: 80
 									Height: PARENT_BOTTOM
--- 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