RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reimplement classic scoring mode

This commit is contained in:
Dan Balasescu 2023-05-09 20:00:14 +09:00
parent 3c3c812ed6
commit a7b623f52a
6 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs
View File

@ -31,13 +31,11 @@ protected override double ComputeTotalScore()
const int tiny_droplets_portion = 400000;
return
(int)Math.Round
((
((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
BonusPortion
) * ScoreMultiplier);
return (
((1000000 - tiny_droplets_portion) + tiny_droplets_portion * (1 - tinyDropletScale)) * ComboPortion / MaxComboPortion +
tiny_droplets_portion * tinyDropletScale * fruitHitsRatio +
BonusPortion
) * ScoreMultiplier;
}
protected override void AddScoreChange(JudgementResult result)

12
osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
View File

@ -20,13 +20,11 @@ public ManiaScoreProcessor(Ruleset ruleset)
protected override double ComputeTotalScore()
{
return
(int)Math.Round
((
200000 * ComboPortion / MaxComboPortion +
800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier);
return (
200000 * ComboPortion / MaxComboPortion +
800000 * Math.Pow(Accuracy.Value, 2 + 2 * Accuracy.Value) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier;
}
protected override void AddScoreChange(JudgementResult result)

12
osu.Game.Rulesets.Osu/Scoring/OsuScoreProcessor.cs
View File

@ -17,13 +17,11 @@ public OsuScoreProcessor(Ruleset ruleset)
protected override double ComputeTotalScore()
{
return
(int)Math.Round
((
700000 * ComboPortion / MaxComboPortion +
300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier);
return (
700000 * ComboPortion / MaxComboPortion +
300000 * Math.Pow(Accuracy.Value, 10) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier;
}
}
}

12
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -21,13 +21,11 @@ public TaikoScoreProcessor(Ruleset ruleset)
protected override double ComputeTotalScore()
{
return
(int)Math.Round
((
250000 * ComboPortion / MaxComboPortion +
750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier);
return (
250000 * ComboPortion / MaxComboPortion +
750000 * Math.Pow(Accuracy.Value, 3.6) * ((double)CurrentBasicJudgements / MaxBasicJudgements) +
BonusPortion
) * ScoreMultiplier;
}
protected override void AddScoreChange(JudgementResult result)

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

@ -274,8 +274,20 @@ private void updateScore()
{
Accuracy.Value = currentMaxBasicScore > 0 ? currentBasicScore / currentMaxBasicScore : 1;
// Todo: Classic/Standardised
TotalScore.Value = (long)Math.Round(ComputeTotalScore());
double standardisedScore = ComputeTotalScore();
if (Mode.Value == ScoringMode.Standardised)
TotalScore.Value = (long)Math.Round(standardisedScore);
else
TotalScore.Value = ConvertToClassic(standardisedScore);
}
public long ConvertToClassic(double standardised)
{
// This gives a similar feeling to osu!stable scoring (ScoreV1) while keeping classic scoring as only a constant multiple of standardised scoring.
// The invariant is important to ensure that scores don't get re-ordered on leaderboards between the two scoring modes.
double scaledRawScore = standardised / MAX_SCORE;
return (long)Math.Round(Math.Pow(scaledRawScore * Math.Max(1, MaxBasicJudgements), 2) * ClassicScoreMultiplier);
}
protected abstract double ComputeTotalScore();

8
osu.Game/Scoring/ScoreManager.cs
View File

@ -107,17 +107,15 @@ public IEnumerable<ScoreInfo> OrderByTotalScore(IEnumerable<ScoreInfo> scores)
/// <returns>The total score.</returns>
public long GetTotalScore([NotNull] ScoreInfo score, ScoringMode mode = ScoringMode.Standardised)
{
// TODO: This is required for playlist aggregate scores. They should likely not be getting here in the first place.
if (string.IsNullOrEmpty(score.BeatmapInfo.MD5Hash))
if (mode == ScoringMode.Standardised)
return score.TotalScore;
var ruleset = score.Ruleset.CreateInstance();
var scoreProcessor = ruleset.CreateScoreProcessor();
scoreProcessor.Mods.Value = score.Mods;
// Todo:
return 0;
// return scoreProcessor.ComputeScore(mode, score);
// Todo: This loses precision because we're dealing with pre-rounded total scores.
return scoreProcessor.ConvertToClassic(score.TotalScore);
}
/// <summary>