h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 11:02:57 +08:00
Code Issues Releases Wiki Activity

Rename a few remaining CountAccuracyJudgement variable

Browse Source
This commit is contained in:
Dean Herbert 2023-05-29 20:08:22 +09:00
parent 1558723420
commit b3ca409339
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -117,12 +117,12 @@ namespace osu.Game.Rulesets.Scoring
/// <summary> /// <summary>
/// The count of all accuracy-affecting judgements in the beatmap. /// The count of all accuracy-affecting judgements in the beatmap.
/// </summary> /// </summary>
private int maximumCountAccuracyJudgements; private int maximumAccuracyJudgementCount;
/// <summary> /// <summary>
/// The count of accuracy-affecting judgements at the current point in time. /// The count of accuracy-affecting judgements at the current point in time.
/// </summary> /// </summary>
private int currentCountAccuracyJudgements; private int currentAccuracyJudgementCount;
/// <summary> /// <summary>
/// The maximum combo score in the beatmap. /// The maximum combo score in the beatmap.
@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Scoring
{ {
currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult); currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult);
currentBaseScore += Judgement.ToNumericResult(result.Type); currentBaseScore += Judgement.ToNumericResult(result.Type);
currentCountAccuracyJudgements++; currentAccuracyJudgementCount++;
} }
if (result.Type.IsBonus()) if (result.Type.IsBonus())
@ -257,7 +257,7 @@ namespace osu.Game.Rulesets.Scoring
{ {
currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult); currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult);
currentBaseScore -= Judgement.ToNumericResult(result.Type); currentBaseScore -= Judgement.ToNumericResult(result.Type);
currentCountAccuracyJudgements--; currentAccuracyJudgementCount--;
} }
if (result.Type.IsBonus()) if (result.Type.IsBonus())
@ -293,7 +293,7 @@ namespace osu.Game.Rulesets.Scoring
MaximumAccuracy.Value = maximumBaseScore > 0 ? (currentBaseScore + (maximumBaseScore - currentMaximumBaseScore)) / maximumBaseScore : 1; MaximumAccuracy.Value = maximumBaseScore > 0 ? (currentBaseScore + (maximumBaseScore - currentMaximumBaseScore)) / maximumBaseScore : 1;
double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1; double comboProgress = maximumComboPortion > 0 ? currentComboPortion / maximumComboPortion : 1;
double accuracyProcess = maximumCountAccuracyJudgements > 0 ? (double)currentCountAccuracyJudgements / maximumCountAccuracyJudgements : 1; double accuracyProcess = maximumAccuracyJudgementCount > 0 ? (double)currentAccuracyJudgementCount / maximumAccuracyJudgementCount : 1;
TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier); TotalScore.Value = (long)Math.Round(ComputeTotalScore(comboProgress, accuracyProcess, currentBonusPortion) * scoreMultiplier);
} }
@ -321,7 +321,7 @@ namespace osu.Game.Rulesets.Scoring
maximumBaseScore = currentBaseScore; maximumBaseScore = currentBaseScore;
maximumComboPortion = currentComboPortion; maximumComboPortion = currentComboPortion;
maximumCountAccuracyJudgements = currentCountAccuracyJudgements; maximumAccuracyJudgementCount = currentAccuracyJudgementCount;
maximumResultCounts.Clear(); maximumResultCounts.Clear();
maximumResultCounts.AddRange(scoreResultCounts); maximumResultCounts.AddRange(scoreResultCounts);
@ -333,7 +333,7 @@ namespace osu.Game.Rulesets.Scoring
currentBaseScore = 0; currentBaseScore = 0;
currentMaximumBaseScore = 0; currentMaximumBaseScore = 0;
currentCountAccuracyJudgements = 0; currentAccuracyJudgementCount = 0;
currentComboPortion = 0; currentComboPortion = 0;
currentBonusPortion = 0; currentBonusPortion = 0;
@ -407,7 +407,7 @@ namespace osu.Game.Rulesets.Scoring
{ {
MaximumBaseScore = currentMaximumBaseScore, MaximumBaseScore = currentMaximumBaseScore,
BaseScore = currentBaseScore, BaseScore = currentBaseScore,
AccuracyJudgementCount = currentCountAccuracyJudgements, AccuracyJudgementCount = currentAccuracyJudgementCount,
ComboPortion = currentComboPortion, ComboPortion = currentComboPortion,
BonusPortion = currentBonusPortion BonusPortion = currentBonusPortion
}; };
@ -416,7 +416,7 @@ namespace osu.Game.Rulesets.Scoring
{ {
currentMaximumBaseScore = statistics.MaximumBaseScore; currentMaximumBaseScore = statistics.MaximumBaseScore;
currentBaseScore = statistics.BaseScore; currentBaseScore = statistics.BaseScore;
currentCountAccuracyJudgements = statistics.AccuracyJudgementCount; currentAccuracyJudgementCount = statistics.AccuracyJudgementCount;
currentComboPortion = statistics.ComboPortion; currentComboPortion = statistics.ComboPortion;
currentBonusPortion = statistics.BonusPortion; currentBonusPortion = statistics.BonusPortion;
} }