sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Extract tuple into class

Browse Source
This commit is contained in:
Dean Herbert
2020-10-07 15:34:03 +09:00
parent 338b4c56ce
commit d6d0bd90a3
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Scoring/ScoreInfo.cs
View File

@ -213,22 +213,22 @@ namespace osu.Game.Scoring
set => isLegacyScore = value;
}
public IEnumerable<(HitResult result, int count, int? maxCount)> GetStatisticsForDisplay()
public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
{
foreach (var key in OrderAttributeUtils.GetValuesInOrder<HitResult>())
foreach (var r in Ruleset.CreateInstance().GetHitResults())
{
if (key.IsBonus())
if (r.result.IsBonus())
continue;
int value = Statistics.GetOrDefault(key);
int value = Statistics.GetOrDefault(r.result);
switch (key)
switch (r.result)
{
case HitResult.SmallTickHit:
{
int total = value + Statistics.GetOrDefault(HitResult.SmallTickMiss);
if (total > 0)
yield return (key, value, total);
yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
break;
}
@ -237,7 +237,7 @@ namespace osu.Game.Scoring
{
int total = value + Statistics.GetOrDefault(HitResult.LargeTickMiss);
if (total > 0)
yield return (key, value, total);
yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
break;
}
@ -247,8 +247,7 @@ namespace osu.Game.Scoring
break;
default:
if (value > 0 || key == HitResult.Miss)
yield return (key, value, null);
yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
break;
}