Skip to content

Commit

Permalink
Replaced "Earned this min" by an Oil Derrick count in the economy sta…
Browse files Browse the repository at this point in the history 
…tistics
  • Loading branch information
@abcdefg30
abcdefg30 committed Sep 7, 2019
1 parent db0c3b7 commit 5156750
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 99 deletions.
5 changes: 4 additions & 1 deletion OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View file
Expand Up @@ -348,7 +348,6 @@ ScrollItemWidget EconomyStats(Player player)

template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.Cash + res.Resources);
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>("SPENT").GetText = () => "$" + res.Spent;

Expand All @@ -360,6 +359,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 derricks = template.GetOrNull<LabelWidget>("DERRICKS");
if (derricks != null)
derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();

return template;
}

Expand Down
48 changes: 24 additions & 24 deletions mods/cnc/chrome/ingame.yaml
View file
Expand Up @@ -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:
Expand Down Expand Up @@ -436,46 +436,46 @@ 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
Text: Assets
Align: Right
Shadow: True
Label@EARNED_HEADER:
X: 500
X: 380
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Earned
Align: Right
Shadow: True
Label@SPENT_HEADER:
X: 580
X: 460
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Spent
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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -815,36 +815,36 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_THIS_MIN:
Label@ASSETS:
X: 300
Y: 0
Width: 120
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS:
X: 420
Label@EARNED:
X: 380
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED:
X: 500
Label@SPENT:
X: 460
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@SPENT:
X: 580
Label@HARVESTERS:
X: 540
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@HARVESTERS:
X: 660
Label@DERRICKS:
X: 630
Y: 0
Width: 80
Height: PARENT_BOTTOM
Expand Down
1 change: 1 addition & 0 deletions mods/cnc/rules/tech.yaml
View file
Expand Up @@ -18,6 +18,7 @@ V19:
ValidStances: Neutral, Enemy
SpawnActorOnDeath:
Actor: V19.Husk
UpdatesDerrickCount:

V19.Husk:
Inherits: ^CivBuildingHusk
Expand Down
35 changes: 10 additions & 25 deletions mods/common/chrome/ingame-observer.yaml
View file
Expand Up @@ -301,7 +301,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS:
X: 0
Y: 0
Width: 740
Width: 620
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
Expand Down Expand Up @@ -340,40 +340,32 @@ Container@OBSERVER_WIDGETS:
Text: $/min
Align: Right
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:
X: 415
X: 295
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Assets
Align: Right
Shadow: True
Label@EARNED_HEADER:
X: 495
X: 375
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Earned
Align: Right
Shadow: True
Label@SPENT_HEADER:
X: 575
X: 455
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Spent
Align: Right
Shadow: True
Label@HARVESTERS_HEADER:
X: 655
X: 535
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Expand Down Expand Up @@ -675,7 +667,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 740
Width: 620
Height: 25
BaseName: scrollitem-nohover
Children:
Expand Down Expand Up @@ -715,36 +707,29 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_THIS_MIN:
X: 295
Y: 0
Width: 120
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS:
X: 415
X: 295
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED:
X: 495
X: 375
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@SPENT:
X: 575
X: 455
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@HARVESTERS:
X: 655
X: 535
Y: 0
Width: 80
Height: PARENT_BOTTOM
Expand Down
48 changes: 24 additions & 24 deletions mods/ra/chrome/ingame-observer.yaml
View file
Expand Up @@ -333,7 +333,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS:
X: 0
Y: 0
Width: 745
Width: 715
Height: PARENT_BOTTOM
Children:
ColorBlock@HEADER_COLOR:
Expand Down Expand Up @@ -372,46 +372,46 @@ 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
Text: Assets
Align: Right
Shadow: True
Label@EARNED_HEADER:
X: 500
X: 380
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Earned
Align: Right
Shadow: True
Label@SPENT_HEADER:
X: 580
X: 460
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Spent
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
Expand Down Expand Up @@ -711,7 +711,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
Width: 745
Width: 715
Height: 24
BaseName: scrollitem-nohover
Children:
Expand Down Expand Up @@ -753,36 +753,36 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED_THIS_MIN:
Label@ASSETS:
X: 300
Y: 0
Width: 120
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS:
X: 420
Label@EARNED:
X: 380
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EARNED:
X: 500
Label@SPENT:
X: 460
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@SPENT:
X: 580
Label@HARVESTERS:
X: 540
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@HARVESTERS:
X: 660
Label@DERRICKS:
X: 630
Y: 0
Width: 80
Height: PARENT_BOTTOM
Expand Down
1 change: 1 addition & 0 deletions mods/ra/rules/civilian.yaml
View file
Expand Up @@ -504,6 +504,7 @@ OILB:
AppearsOnMapPreview:
GivesCashOnCapture:
Amount: 100
UpdatesDerrickCount:

BR1:
Inherits: ^Bridge
Expand Down

0 comments on commit 5156750

Please sign in to comment.