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

Keep army and income graph disabled if they were disabled once

Browse Source
This commit is contained in:
abcdefg30
2019-10-06 17:24:56 +02:00
committed by reaperrr
parent ee839869fc
commit 3672b4e674
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
View File

@@ -62,12 +62,17 @@ namespace OpenRA.Mods.Common.Traits
int ticks; int ticks;
int replayTimestep; int replayTimestep;
bool armyGraphDisabled;
bool incomeGraphDisabled;
public PlayerStatistics(Actor self) { } public PlayerStatistics(Actor self) { }
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
resources = self.TraitOrDefault<PlayerResources>(); resources = self.TraitOrDefault<PlayerResources>();
experience = self.TraitOrDefault<PlayerExperience>(); experience = self.TraitOrDefault<PlayerExperience>();
incomeGraphDisabled = resources == null;
} }
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
@@ -79,11 +84,15 @@ namespace OpenRA.Mods.Common.Traits
{ {
ticks = 0; ticks = 0;
if (ArmyValue != 0 || self.Owner.WinState == WinState.Undefined) if (!armyGraphDisabled && (ArmyValue != 0 || self.Owner.WinState == WinState.Undefined))
ArmySamples.Add(ArmyValue); ArmySamples.Add(ArmyValue);
else
armyGraphDisabled = true;
if (resources != null && (Income != 0 || self.Owner.WinState == WinState.Undefined)) if (!incomeGraphDisabled && (Income != 0 || self.Owner.WinState == WinState.Undefined))
IncomeSamples.Add(Income); IncomeSamples.Add(Income);
else
incomeGraphDisabled = true;
} }
if (resources == null) if (resources == null)
@@ -134,7 +143,10 @@ namespace OpenRA.Mods.Common.Traits
if (w.IsReplay) if (w.IsReplay)
replayTimestep = w.WorldActor.Trait<MapOptions>().GameSpeed.Timestep; replayTimestep = w.WorldActor.Trait<MapOptions>().GameSpeed.Timestep;
if (!armyGraphDisabled)
ArmySamples.Add(ArmyValue); ArmySamples.Add(ArmyValue);
if (!incomeGraphDisabled)
IncomeSamples.Add(Income); IncomeSamples.Add(Income);
} }
} }