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

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

Browse Source
This commit is contained in:
abcdefg30
2019-09-01 00:42:31 +02:00
committed by teinarss
parent 1e6660ecb2
commit 912a424596
7 changed files with 76 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -348,7 +348,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.Cash + res.Resources); template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.Cash + res.Resources);
template.Get<LabelWidget>("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned); template.Get<LabelWidget>("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned);
template.Get<LabelWidget>("EARNED_THIS_MIN").GetText = () => "$" + stats.EarnedThisMinute;
template.Get<LabelWidget>("EARNED").GetText = () => "$" + res.Earned; template.Get<LabelWidget>("EARNED").GetText = () => "$" + res.Earned;
template.Get<LabelWidget>("SPENT").GetText = () => "$" + res.Spent; template.Get<LabelWidget>("SPENT").GetText = () => "$" + res.Spent;
@@ -360,6 +359,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var harvesters = template.Get<LabelWidget>("HARVESTERS"); var harvesters = template.Get<LabelWidget>("HARVESTERS");
harvesters.GetText = () => world.ActorsHavingTrait<Harvester>().Count(a => a.Owner == player && !a.IsDead).ToString(); harvesters.GetText = () => world.ActorsHavingTrait<Harvester>().Count(a => a.Owner == player && !a.IsDead).ToString();
var derricks = template.GetOrNull<LabelWidget>("DERRICKS");
if (derricks != null)
derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();
return template; return template;
} }

50
mods/cnc/chrome/ingame.yaml
View File

@@ -397,7 +397,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 715
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ColorBlock@HEADER_COLOR: ColorBlock@HEADER_COLOR:
@@ -436,16 +436,8 @@ Container@OBSERVER_WIDGETS:
Text: $/min Text: $/min
Align: Right Align: Right
Shadow: True 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: Label@ASSETS_HEADER:
X: 420 X: 300
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -453,7 +445,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_HEADER: Label@EARNED_HEADER:
X: 500 X: 380
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -461,7 +453,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT_HEADER: Label@SPENT_HEADER:
X: 580 X: 460
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -469,13 +461,21 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS_HEADER: Label@HARVESTERS_HEADER:
X: 660 X: 540
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
Text: Harvesters Text: Harvesters
Align: Right Align: Right
Shadow: True 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: Container@PRODUCTION_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
@@ -773,7 +773,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 715
Height: 24 Height: 24
BaseName: scrollitem-nohover BaseName: scrollitem-nohover
Children: Children:
@@ -815,36 +815,36 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_THIS_MIN:
X: 300
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS: Label@ASSETS:
X: 420 X: 300
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED: Label@EARNED:
X: 500 X: 380
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT: Label@SPENT:
X: 580 X: 460
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS: Label@HARVESTERS:
X: 660 X: 540
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DERRICKS:
X: 630
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM

1
mods/cnc/rules/tech.yaml
View File

@@ -18,6 +18,7 @@ V19:
ValidStances: Neutral, Enemy ValidStances: Neutral, Enemy
SpawnActorOnDeath: SpawnActorOnDeath:
Actor: V19.Husk Actor: V19.Husk
UpdatesDerrickCount:
V19.Husk: V19.Husk:
Inherits: ^CivBuildingHusk Inherits: ^CivBuildingHusk

35
mods/common/chrome/ingame-observer.yaml
View File

@@ -301,7 +301,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
Width: 740 Width: 620
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ColorBlock@HEADER_COLOR: ColorBlock@HEADER_COLOR:
@@ -340,16 +340,8 @@ Container@OBSERVER_WIDGETS:
Text: $/min Text: $/min
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_THIS_MIN_HEADER:
X: 295
Width: 120
Height: PARENT_BOTTOM
Font: Bold
Text: Earned this min
Align: Right
Shadow: True
Label@ASSETS_HEADER: Label@ASSETS_HEADER:
X: 415 X: 295
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -357,7 +349,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_HEADER: Label@EARNED_HEADER:
X: 495 X: 375
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -365,7 +357,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT_HEADER: Label@SPENT_HEADER:
X: 575 X: 455
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -373,7 +365,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS_HEADER: Label@HARVESTERS_HEADER:
X: 655 X: 535
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -675,7 +667,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0
Width: 740 Width: 620
Height: 25 Height: 25
BaseName: scrollitem-nohover BaseName: scrollitem-nohover
Children: Children:
@@ -715,36 +707,29 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_THIS_MIN:
X: 295
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS: Label@ASSETS:
X: 415 X: 295
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED: Label@EARNED:
X: 495 X: 375
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT: Label@SPENT:
X: 575 X: 455
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS: Label@HARVESTERS:
X: 655 X: 535
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM

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

@@ -333,7 +333,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 715
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ColorBlock@HEADER_COLOR: ColorBlock@HEADER_COLOR:
@@ -372,16 +372,8 @@ Container@OBSERVER_WIDGETS:
Text: $/min Text: $/min
Align: Right Align: Right
Shadow: True 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: Label@ASSETS_HEADER:
X: 420 X: 300
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -389,7 +381,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_HEADER: Label@EARNED_HEADER:
X: 500 X: 380
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -397,7 +389,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT_HEADER: Label@SPENT_HEADER:
X: 580 X: 460
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -405,13 +397,21 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS_HEADER: Label@HARVESTERS_HEADER:
X: 660 X: 540
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
Text: Harvesters Text: Harvesters
Align: Right Align: Right
Shadow: True 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: Container@PRODUCTION_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
@@ -711,7 +711,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 715
Height: 24 Height: 24
BaseName: scrollitem-nohover BaseName: scrollitem-nohover
Children: Children:
@@ -753,36 +753,36 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_THIS_MIN:
X: 300
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS: Label@ASSETS:
X: 420 X: 300
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED: Label@EARNED:
X: 500 X: 380
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT: Label@SPENT:
X: 580 X: 460
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS: Label@HARVESTERS:
X: 660 X: 540
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DERRICKS:
X: 630
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM

1
mods/ra/rules/civilian.yaml
View File

@@ -504,6 +504,7 @@ OILB:
AppearsOnMapPreview: AppearsOnMapPreview:
GivesCashOnCapture: GivesCashOnCapture:
Amount: 100 Amount: 100
UpdatesDerrickCount:
BR1: BR1:
Inherits: ^Bridge Inherits: ^Bridge

35
mods/ts/chrome/ingame-observer.yaml
View File

@@ -301,7 +301,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 625
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ColorBlock@HEADER_COLOR: ColorBlock@HEADER_COLOR:
@@ -340,16 +340,8 @@ Container@OBSERVER_WIDGETS:
Text: $/min Text: $/min
Align: Right Align: Right
Shadow: True 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: Label@ASSETS_HEADER:
X: 420 X: 300
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -357,7 +349,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_HEADER: Label@EARNED_HEADER:
X: 500 X: 380
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -365,7 +357,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT_HEADER: Label@SPENT_HEADER:
X: 580 X: 460
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -373,7 +365,7 @@ Container@OBSERVER_WIDGETS:
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS_HEADER: Label@HARVESTERS_HEADER:
X: 660 X: 540
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Font: Bold Font: Bold
@@ -677,7 +669,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0
Width: 745 Width: 625
Height: 24 Height: 24
BaseName: scrollitem-nohover BaseName: scrollitem-nohover
Children: Children:
@@ -719,36 +711,29 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED_THIS_MIN:
X: 300
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS: Label@ASSETS:
X: 420 X: 300
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@EARNED: Label@EARNED:
X: 500 X: 380
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@SPENT: Label@SPENT:
X: 580 X: 460
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@HARVESTERS: Label@HARVESTERS:
X: 660 X: 540
Y: 0 Y: 0
Width: 80 Width: 80
Height: PARENT_BOTTOM Height: PARENT_BOTTOM