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

Added carryalls to spectator Economy statistics

Browse Source
This commit is contained in:
Gustas
2022-12-19 13:32:41 +02:00
committed by Matthias Mailänder
parent f3e44094a1
commit 55cf40ec52
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,6 +448,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var harvesters = template.Get<LabelWidget>("HARVESTERS"); var harvesters = template.Get<LabelWidget>("HARVESTERS");
harvesters.GetText = () => world.ActorsWithTrait<Harvester>().Count(a => a.Actor.Owner == player && !a.Actor.IsDead && !a.Trait.IsTraitDisabled).ToString(); 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"); var derricks = template.GetOrNull<LabelWidget>("DERRICKS");
if (derricks != null) if (derricks != null)
derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString(); derricks.GetText = () => world.ActorsHavingTrait<UpdatesDerrickCount>().Count(a => a.Owner == player && !a.IsDead).ToString();

19
mods/d2k/chrome/ingame-observer.yaml
View File

@@ -313,7 +313,7 @@ Container@OBSERVER_WIDGETS:
Container@ECONOMY_STATS_HEADERS: Container@ECONOMY_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
Width: 640 Width: 720
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ColorBlock@HEADER_COLOR: ColorBlock@HEADER_COLOR:
@@ -384,6 +384,14 @@ Container@OBSERVER_WIDGETS:
Text: Harvesters Text: Harvesters
Align: Right Align: Right
Shadow: True Shadow: True
Label@CARRYALLS_HEADER:
X: 635
Width: 80
Height: PARENT_BOTTOM
Font: Bold
Text: Carryalls
Align: Right
Shadow: True
Container@PRODUCTION_STATS_HEADERS: Container@PRODUCTION_STATS_HEADERS:
X: 0 X: 0
Y: 0 Y: 0
@@ -717,7 +725,7 @@ Container@OBSERVER_WIDGETS:
ScrollItem@ECONOMY_PLAYER_TEMPLATE: ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0
Width: 640 Width: 720
Height: 25 Height: 25
Background: scrollitem-nohover Background: scrollitem-nohover
Children: Children:
@@ -785,6 +793,13 @@ Container@OBSERVER_WIDGETS:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Align: Right Align: Right
Shadow: True Shadow: True
Label@CARRYALLS:
X: 635
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE: ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0 X: 0
Y: 0 Y: 0