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

Score -> ScoreInfo

Browse Source
This commit is contained in:
smoogipoo
2018-11-28 18:33:01 +09:00
parent 5b409a5ae5
commit 219929eb47
42 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
View File

@ -30,8 +30,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
private int countMeh;
private int countMiss;
public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, Score score)
: base(ruleset, beatmap, score)
public OsuPerformanceCalculator(Ruleset ruleset, WorkingBeatmap beatmap, ScoreInfo scoreInfo)
: base(ruleset, beatmap, scoreInfo)
{
countHitCircles = Beatmap.HitObjects.Count(h => h is HitCircle);
@ -42,13 +42,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty
public override double Calculate(Dictionary<string, double> categoryRatings = null)
{
mods = Score.Mods;
accuracy = Score.Accuracy;
scoreMaxCombo = Score.MaxCombo;
countGreat = Convert.ToInt32(Score.Statistics[HitResult.Great]);
countGood = Convert.ToInt32(Score.Statistics[HitResult.Good]);
countMeh = Convert.ToInt32(Score.Statistics[HitResult.Meh]);
countMiss = Convert.ToInt32(Score.Statistics[HitResult.Miss]);
mods = ScoreInfo.Mods;
accuracy = ScoreInfo.Accuracy;
scoreMaxCombo = ScoreInfo.MaxCombo;
countGreat = Convert.ToInt32(ScoreInfo.Statistics[HitResult.Great]);
countGood = Convert.ToInt32(ScoreInfo.Statistics[HitResult.Good]);
countMeh = Convert.ToInt32(ScoreInfo.Statistics[HitResult.Meh]);
countMiss = Convert.ToInt32(ScoreInfo.Statistics[HitResult.Miss]);
// Don't count scores made with supposedly unranked mods
if (mods.Any(m => !m.Ranked))