h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-29 19:58:40 +08:00
Code Issues Releases Wiki Activity

Add ScoreProcessor methods to override numeric result

Browse Source
This commit is contained in:
Dan Balasescu 2023-12-19 13:48:46 +09:00
parent b6ed792a41
commit c1b55c7fac
No known key found for this signature in database
4 changed files with 21 additions and 9 deletions
osu.Game.Rulesets.Catch/Scoring
CatchScoreProcessor.cs
osu.Game.Rulesets.Mania/Scoring
ManiaScoreProcessor.cs
osu.Game.Rulesets.Taiko/Scoring
TaikoScoreProcessor.cs
osu.Game/Rulesets/Scoring
ScoreProcessor.cs

2
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs

@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Scoring
} }
protected override double GetComboScoreChange(JudgementResult result) protected override double GetComboScoreChange(JudgementResult result)
=> Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base)); => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(combo_cap, combo_base));
public override ScoreRank RankFromAccuracy(double accuracy) public override ScoreRank RankFromAccuracy(double accuracy)
{ {

2
osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs

@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Scoring
} }
protected override double GetComboScoreChange(JudgementResult result) protected override double GetComboScoreChange(JudgementResult result)
=> Judgement.ToNumericResult(result.Type) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)); => GetNumericResultFor(result) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base));
private class JudgementOrderComparer : IComparer<HitObject> private class JudgementOrderComparer : IComparer<HitObject>
{ {

2
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs

@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
protected override double GetComboScoreChange(JudgementResult result) protected override double GetComboScoreChange(JudgementResult result)
{ {
return Judgement.ToNumericResult(result.Type) return GetNumericResultFor(result)
* Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base)) * Math.Min(Math.Max(0.5, Math.Log(result.ComboAfterJudgement, combo_base)), Math.Log(400, combo_base))
* strongScaleValue(result); * strongScaleValue(result);
} }

24
osu.Game/Rulesets/Scoring/ScoreProcessor.cs

@ -227,12 +227,12 @@ namespace osu.Game.Rulesets.Scoring
if (result.Judgement.MaxResult.AffectsAccuracy()) if (result.Judgement.MaxResult.AffectsAccuracy())
{ {
currentMaximumBaseScore += Judgement.ToNumericResult(result.Judgement.MaxResult); currentMaximumBaseScore += GetMaxNumericResultFor(result);
currentAccuracyJudgementCount++; currentAccuracyJudgementCount++;
} }
if (result.Type.AffectsAccuracy()) if (result.Type.AffectsAccuracy())
currentBaseScore += Judgement.ToNumericResult(result.Type); currentBaseScore += GetNumericResultFor(result);
if (result.Type.IsBonus()) if (result.Type.IsBonus())
currentBonusPortion += GetBonusScoreChange(result); currentBonusPortion += GetBonusScoreChange(result);
@ -276,12 +276,12 @@ namespace osu.Game.Rulesets.Scoring
if (result.Judgement.MaxResult.AffectsAccuracy()) if (result.Judgement.MaxResult.AffectsAccuracy())
{ {
currentMaximumBaseScore -= Judgement.ToNumericResult(result.Judgement.MaxResult); currentMaximumBaseScore -= GetMaxNumericResultFor(result);
currentAccuracyJudgementCount--; currentAccuracyJudgementCount--;
} }
if (result.Type.AffectsAccuracy()) if (result.Type.AffectsAccuracy())
currentBaseScore -= Judgement.ToNumericResult(result.Type); currentBaseScore -= GetNumericResultFor(result);
if (result.Type.IsBonus()) if (result.Type.IsBonus())
currentBonusPortion -= GetBonusScoreChange(result); currentBonusPortion -= GetBonusScoreChange(result);
@ -297,9 +297,21 @@ namespace osu.Game.Rulesets.Scoring
updateScore(); updateScore();
} }
protected virtual double GetBonusScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Type); protected virtual double GetBonusScoreChange(JudgementResult result) => GetNumericResultFor(result);
protected virtual double GetComboScoreChange(JudgementResult result) => Judgement.ToNumericResult(result.Judgement.MaxResult) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT); protected virtual double GetComboScoreChange(JudgementResult result) => GetMaxNumericResultFor(result) * Math.Pow(result.ComboAfterJudgement, COMBO_EXPONENT);
/// <summary>
/// Retrieves the numeric score representation for a <see cref="JudgementResult"/>.
/// </summary>
/// <param name="result">The <see cref="JudgementResult"/>.</param>
protected virtual double GetNumericResultFor(JudgementResult result) => result.Judgement.NumericResultFor(result);
/// <summary>
/// Retrieves the maximum numeric score representation for a <see cref="JudgementResult"/>.
/// </summary>
/// <param name="result">The <see cref="JudgementResult"/>.</param>
protected virtual double GetMaxNumericResultFor(JudgementResult result) => result.Judgement.MaxNumericResult;
protected virtual void ApplyScoreChange(JudgementResult result) protected virtual void ApplyScoreChange(JudgementResult result)
{ {