Revert MaxBaseScore to being a private field (no longe required to be public)

This commit is contained in:
Dean Herbert
2020-12-17 15:47:20 +09:00
parent cda3bd2017
commit 41d8b84bd7

View File

@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Scoring
/// <summary> /// <summary>
/// The maximum achievable base score. /// The maximum achievable base score.
/// </summary> /// </summary>
public double MaxBaseScore { get; private set; } private double maxBaseScore;
private double rollingMaxBaseScore; private double rollingMaxBaseScore;
private double baseScore; private double baseScore;
@ -201,7 +201,7 @@ namespace osu.Game.Rulesets.Scoring
private double getScore(ScoringMode mode) private double getScore(ScoringMode mode)
{ {
return GetScore(mode, maxAchievableCombo, return GetScore(mode, maxAchievableCombo,
MaxBaseScore > 0 ? baseScore / MaxBaseScore : 0, maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1, maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
scoreResultCounts); scoreResultCounts);
} }
@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value; computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
} }
double accuracy = MaxBaseScore > 0 ? computedBaseScore / MaxBaseScore : 0; double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1; double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts); double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
@ -299,7 +299,7 @@ namespace osu.Game.Rulesets.Scoring
if (storeResults) if (storeResults)
{ {
maxAchievableCombo = HighestCombo.Value; maxAchievableCombo = HighestCombo.Value;
MaxBaseScore = baseScore; maxBaseScore = baseScore;
} }
baseScore = 0; baseScore = 0;