diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index c6e7988543..e96ff1f7f1 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -300,7 +300,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
HitObjects = { new TestHitObject(result) }
});
- Assert.That(scoreProcessor.GetImmediateScore(ScoringMode.Standardised, result.AffectsCombo() ? 1 : 0, statistic), Is.EqualTo(expectedScore).Within(0.5d));
+ Assert.That(scoreProcessor.GetScore(ScoringMode.Standardised, result.AffectsCombo() ? 1 : 0, statistic), Is.EqualTo(expectedScore).Within(0.5d));
}
private class TestJudgement : Judgement
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
index 3d384f5914..dfb8066b28 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Difficulty
ScoreProcessor scoreProcessor = ruleset.CreateScoreProcessor();
scoreProcessor.HighestCombo.Value = perfectPlay.MaxCombo;
scoreProcessor.Mods.Value = perfectPlay.Mods;
- perfectPlay.TotalScore = (long)scoreProcessor.GetImmediateScore(ScoringMode.Standardised, perfectPlay.MaxCombo, statistics);
+ perfectPlay.TotalScore = (long)scoreProcessor.GetScore(ScoringMode.Standardised, perfectPlay.MaxCombo, statistics);
// compute rank achieved
// default to SS, then adjust the rank with mods
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index d5a5aa4592..af9b4db5ca 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -218,6 +218,29 @@ namespace osu.Game.Rulesets.Scoring
scoreResultCounts);
}
+ ///
+ /// Given a minimal set of inputs, return the computed score for the tracked beatmap / mods combination, at the current point in time.
+ ///
+ /// The to compute the total score in.
+ /// The maximum combo achievable in the beatmap.
+ /// Statistics to be used for calculating accuracy, bonus score, etc.
+ /// The computed score for provided inputs.
+ public double GetScore(ScoringMode mode, int maxCombo, Dictionary statistics)
+ {
+ // calculate base score from statistics pairs
+ int computedBaseScore = 0;
+
+ foreach (var pair in statistics)
+ {
+ if (!pair.Key.AffectsAccuracy())
+ continue;
+
+ computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
+ }
+
+ return GetScore(mode, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), statistics);
+ }
+
///
/// Computes the total score.
///
@@ -250,29 +273,6 @@ namespace osu.Game.Rulesets.Scoring
}
}
- ///
- /// Given a minimal set of inputs, return the computed score for the tracked beatmap / mods combination, at the current point in time.
- ///
- /// The to compute the total score in.
- /// The maximum combo achievable in the beatmap.
- /// Statistics to be used for calculating accuracy, bonus score, etc.
- /// The computed score for provided inputs.
- public double GetImmediateScore(ScoringMode mode, int maxCombo, Dictionary statistics)
- {
- // calculate base score from statistics pairs
- int computedBaseScore = 0;
-
- foreach (var pair in statistics)
- {
- if (!pair.Key.AffectsAccuracy())
- continue;
-
- computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
- }
-
- return GetScore(mode, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), statistics);
- }
-
///
/// Get the accuracy fraction for the provided base score.
///
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 83c73e5a70..0516e00b8b 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Screens.Play.HUD
{
var header = frame.Header;
- Score.Value = ScoreProcessor.GetImmediateScore(ScoringMode.Value, header.MaxCombo, header.Statistics);
+ Score.Value = ScoreProcessor.GetScore(ScoringMode.Value, header.MaxCombo, header.Statistics);
Accuracy.Value = header.Accuracy;
CurrentCombo.Value = header.Combo;
}