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

Replace "$/min" by "Income" and increase graph update rates

Browse Source
This commit is contained in:
abcdefg30
2019-09-07 04:42:26 +02:00
committed by reaperrr
parent 4ca42f6e83
commit ee839869fc
6 changed files with 159 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -29,14 +28,6 @@ namespace OpenRA.Mods.Common.Traits
public int OrderCount;
public int EarnedThisMinute
{
get
{
return resources != null ? resources.Earned - earnedAtBeginningOfMinute : 0;
}
}
public int Experience
{
get
@@ -45,8 +36,10 @@ namespace OpenRA.Mods.Common.Traits
}
}
public List<int> EarnedSamples = new List<int>(100);
int earnedAtBeginningOfMinute;
// Low resolution (every 30 seconds) record of earnings, covering the entire game
public List<int> IncomeSamples = new List<int>(100);
public int Income;
public int DisplayIncome;
public List<int> ArmySamples = new List<int>(100);
@@ -60,8 +53,14 @@ namespace OpenRA.Mods.Common.Traits
public int BuildingsDead;
public int ArmyValue;
int replayTimestep;
// High resolution (every second) record of earnings, limited to the last minute
readonly Queue<int> earnedSeconds = new Queue<int>(60);
int lastIncome;
int lastIncomeTick;
int ticks;
int replayTimestep;
public PlayerStatistics(Actor self) { }
@@ -71,32 +70,37 @@ namespace OpenRA.Mods.Common.Traits
experience = self.TraitOrDefault<PlayerExperience>();
}
void UpdateEarnedThisMinute()
{
EarnedSamples.Add(EarnedThisMinute);
earnedAtBeginningOfMinute = resources != null ? resources.Earned : 0;
}
void UpdateArmyThisMinute()
{
ArmySamples.Add(ArmyValue);
}
void ITick.Tick(Actor self)
{
if (self.Owner.WinState != WinState.Undefined)
return;
ticks++;
var timestep = self.World.IsReplay ? replayTimestep : self.World.Timestep;
if (ticks * timestep >= 60000)
if (ticks * timestep >= 30000)
{
ticks = 0;
UpdateEarnedThisMinute();
UpdateArmyThisMinute();
if (ArmyValue != 0 || self.Owner.WinState == WinState.Undefined)
ArmySamples.Add(ArmyValue);
if (resources != null && (Income != 0 || self.Owner.WinState == WinState.Undefined))
IncomeSamples.Add(Income);
}
if (resources == null)
return;
var tickDelta = self.World.WorldTick - lastIncomeTick;
if (tickDelta * timestep >= 1000)
{
lastIncomeTick = self.World.WorldTick;
var lastEarned = earnedSeconds.Count > 59 ? earnedSeconds.Dequeue() : 0;
lastIncome = DisplayIncome = Income;
Income = resources.Earned - lastEarned;
earnedSeconds.Enqueue(resources.Earned);
}
else
DisplayIncome = int2.Lerp(lastIncome, Income, tickDelta * timestep, 1000);
}
public void ResolveOrder(Actor self, Order order)
@@ -130,8 +134,8 @@ namespace OpenRA.Mods.Common.Traits
if (w.IsReplay)
replayTimestep = w.WorldActor.Trait<MapOptions>().GameSpeed.Timestep;
UpdateEarnedThisMinute();
UpdateArmyThisMinute();
ArmySamples.Add(ArmyValue);
IncomeSamples.Add(Income);
}
}