RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-29 02:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename member

Browse Source
This commit is contained in:
Dan Balasescu 2022-06-02 16:35:50 +09:00
parent 055845d4f5
commit a638392e81
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Scoring
scoringValues.BaseScore += result.IsHit() ? Judgement.ToNumericResult(result) : 0; scoringValues.BaseScore += result.IsHit() ? Judgement.ToNumericResult(result) : 0;
if (result.IsBasic()) if (result.IsBasic())
scoringValues.HitObjects++; scoringValues.CountBasicHitObjects++;
} }
/// <summary> /// <summary>
@ -260,7 +260,7 @@ namespace osu.Game.Rulesets.Scoring
scoringValues.BaseScore -= result.IsHit() ? Judgement.ToNumericResult(result) : 0; scoringValues.BaseScore -= result.IsHit() ? Judgement.ToNumericResult(result) : 0;
if (result.IsBasic()) if (result.IsBasic())
scoringValues.HitObjects--; scoringValues.CountBasicHitObjects--;
} }
private void updateScore() private void updateScore()
@ -340,7 +340,7 @@ namespace osu.Game.Rulesets.Scoring
if (scoreInfo.IsLegacyScore && scoreInfo.Ruleset.OnlineID == 3 && maximum.BaseScore > 0) if (scoreInfo.IsLegacyScore && scoreInfo.Ruleset.OnlineID == 3 && maximum.BaseScore > 0)
accuracyRatio = current.BaseScore / maximum.BaseScore; accuracyRatio = current.BaseScore / maximum.BaseScore;
return ComputeScore(mode, accuracyRatio, comboRatio, current.BonusScore, maximum.HitObjects); return ComputeScore(mode, accuracyRatio, comboRatio, current.BonusScore, maximum.CountBasicHitObjects);
} }
/// <summary> /// <summary>
@ -355,7 +355,7 @@ namespace osu.Game.Rulesets.Scoring
{ {
double accuracyRatio = maximum.BaseScore > 0 ? current.BaseScore / maximum.BaseScore : 1; double accuracyRatio = maximum.BaseScore > 0 ? current.BaseScore / maximum.BaseScore : 1;
double comboRatio = maximum.MaxCombo > 0 ? (double)current.MaxCombo / maximum.MaxCombo : 1; double comboRatio = maximum.MaxCombo > 0 ? (double)current.MaxCombo / maximum.MaxCombo : 1;
return ComputeScore(mode, accuracyRatio, comboRatio, current.BonusScore, maximum.HitObjects); return ComputeScore(mode, accuracyRatio, comboRatio, current.BonusScore, maximum.CountBasicHitObjects);
} }
/// <summary> /// <summary>
@ -479,11 +479,11 @@ namespace osu.Game.Rulesets.Scoring
/// This method is useful in a variety of situations, with a few drawbacks that need to be considered: /// This method is useful in a variety of situations, with a few drawbacks that need to be considered:
/// <list type="bullet"> /// <list type="bullet">
/// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item> /// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item>
/// <item>The current and maximum <see cref="ScoringValues.HitObjects"/> will always be the same value.</item> /// <item>The current and maximum <see cref="ScoringValues.CountBasicHitObjects"/> will always be the same value.</item>
/// </list> /// </list>
/// Consumers are expected to more accurately fill in the above values through external means. /// Consumers are expected to more accurately fill in the above values through external means.
/// <para> /// <para>
/// <b>Ensure</b> to fill in the maximum <see cref="ScoringValues.HitObjects"/> for use in /// <b>Ensure</b> to fill in the maximum <see cref="ScoringValues.CountBasicHitObjects"/> for use in
/// <see cref="ComputeScore(osu.Game.Rulesets.Scoring.ScoringMode,osu.Game.Scoring.ScoringValues,osu.Game.Scoring.ScoringValues)"/>. /// <see cref="ComputeScore(osu.Game.Rulesets.Scoring.ScoringMode,osu.Game.Scoring.ScoringValues,osu.Game.Scoring.ScoringValues)"/>.
/// </para> /// </para>
/// </remarks> /// </remarks>
@ -504,11 +504,11 @@ namespace osu.Game.Rulesets.Scoring
/// This method is useful in a variety of situations, with a few drawbacks that need to be considered: /// This method is useful in a variety of situations, with a few drawbacks that need to be considered:
/// <list type="bullet"> /// <list type="bullet">
/// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item> /// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item>
/// <item>The current and maximum <see cref="ScoringValues.HitObjects"/> will always be the same value.</item> /// <item>The current and maximum <see cref="ScoringValues.CountBasicHitObjects"/> will always be the same value.</item>
/// </list> /// </list>
/// Consumers are expected to more accurately fill in the above values through external means. /// Consumers are expected to more accurately fill in the above values through external means.
/// <para> /// <para>
/// <b>Ensure</b> to fill in the maximum <see cref="ScoringValues.HitObjects"/> for use in /// <b>Ensure</b> to fill in the maximum <see cref="ScoringValues.CountBasicHitObjects"/> for use in
/// <see cref="ComputeScore(osu.Game.Rulesets.Scoring.ScoringMode,osu.Game.Scoring.ScoringValues,osu.Game.Scoring.ScoringValues)"/>. /// <see cref="ComputeScore(osu.Game.Rulesets.Scoring.ScoringMode,osu.Game.Scoring.ScoringValues,osu.Game.Scoring.ScoringValues)"/>.
/// </para> /// </para>
/// </remarks> /// </remarks>
@ -530,7 +530,7 @@ namespace osu.Game.Rulesets.Scoring
/// <list type="bullet"> /// <list type="bullet">
/// <item>The current <see cref="ScoringValues.MaxCombo"/> will always be 0.</item> /// <item>The current <see cref="ScoringValues.MaxCombo"/> will always be 0.</item>
/// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item> /// <item>The maximum <see cref="ScoringValues.BonusScore"/> will always be 0.</item>
/// <item>The current and maximum <see cref="ScoringValues.HitObjects"/> will always be the same value.</item> /// <item>The current and maximum <see cref="ScoringValues.CountBasicHitObjects"/> will always be the same value.</item>
/// </list> /// </list>
/// Consumers are expected to more accurately fill in the above values (especially the current <see cref="ScoringValues.MaxCombo"/>) via external means (e.g. <see cref="ScoreInfo"/>). /// Consumers are expected to more accurately fill in the above values (especially the current <see cref="ScoringValues.MaxCombo"/>) via external means (e.g. <see cref="ScoreInfo"/>).
/// </remarks> /// </remarks>
@ -582,8 +582,8 @@ namespace osu.Game.Rulesets.Scoring
if (result.IsBasic()) if (result.IsBasic())
{ {
current.HitObjects += count; current.CountBasicHitObjects += count;
maximum.HitObjects += count; maximum.CountBasicHitObjects += count;
} }
} }
} }

2
osu.Game/Scoring/ScoringValues.cs
View File

@ -33,6 +33,6 @@ namespace osu.Game.Scoring
/// The count of "basic" <see cref="HitObject"/>s. See: <see cref="HitResultExtensions.IsBasic"/>. /// The count of "basic" <see cref="HitObject"/>s. See: <see cref="HitResultExtensions.IsBasic"/>.
/// </summary> /// </summary>
[Key(3)] [Key(3)]
public int HitObjects; public int CountBasicHitObjects;
} }
} }