sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Require ScoreProcessor to receive ruleset

Browse Source
This commit is contained in:
Dan Balasescu
2022-03-14 15:51:10 +09:00
parent 9cc7f70872
commit 3fff7f4b7e
30 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,7 @@ namespace osu.Game.Rulesets.Scoring
/// </summary>
protected virtual double ClassicScoreMultiplier => 36;
private readonly Ruleset ruleset;
private readonly double accuracyPortion;
private readonly double comboPortion;
@ -116,8 +117,10 @@ namespace osu.Game.Rulesets.Scoring
private double scoreMultiplier = 1;
public ScoreProcessor()
public ScoreProcessor(Ruleset ruleset)
{
this.ruleset = ruleset;
accuracyPortion = DefaultAccuracyPortion;
comboPortion = DefaultComboPortion;
@ -255,7 +258,7 @@ namespace osu.Game.Rulesets.Scoring
/// <returns>The total score in the given <see cref="ScoringMode"/>.</returns>
public double ComputeFinalScore(ScoringMode mode, ScoreInfo scoreInfo)
{
extractFromStatistics(scoreInfo.Ruleset.CreateInstance(),
extractFromStatistics(ruleset,
scoreInfo.Statistics,
out double extractedBaseScore,
out double extractedMaxBaseScore,
@ -282,7 +285,7 @@ namespace osu.Game.Rulesets.Scoring
if (!beatmapApplied)
throw new InvalidOperationException($"Cannot compute partial score without calling {nameof(ApplyBeatmap)}.");
extractFromStatistics(scoreInfo.Ruleset.CreateInstance(),
extractFromStatistics(ruleset,
scoreInfo.Statistics,
out double extractedBaseScore,
out _,
@ -317,7 +320,7 @@ namespace osu.Game.Rulesets.Scoring
if (scoreInfo.IsLegacyScore && scoreInfo.Ruleset.OnlineID == 3)
{
extractFromStatistics(
scoreInfo.Ruleset.CreateInstance(),
ruleset,
scoreInfo.Statistics,
out double computedBaseScore,
out double computedMaxBaseScore,