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

`ILegacyScoreProcessor` -> `ILegacyScoreSimulator`

This commit is contained in:
Dean Herbert 2023-07-04 17:32:54 +09:00
parent 3b5f3b67a7
commit 1629024111
15 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/CatchRuleset.cs
View File

@ -202,7 +202,7 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result)
public int LegacyID => 2;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new CatchLegacyScoreProcessor();
public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new CatchLegacyScoreSimulator();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();

10
osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
View File

@ -51,11 +51,11 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
if (ComputeLegacyScoringValues)
{
CatchLegacyScoreProcessor sv1Processor = new CatchLegacyScoreProcessor();
sv1Processor.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
attributes.LegacyComboScore = sv1Processor.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
CatchLegacyScoreSimulator sv1Simulator = new CatchLegacyScoreSimulator();
sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
attributes.LegacyComboScore = sv1Simulator.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
}
return attributes;

2
osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreProcessor.cs → osu.Game.Rulesets.Catch/Difficulty/CatchLegacyScoreSimulator.cs
View File

@ -14,7 +14,7 @@
namespace osu.Game.Rulesets.Catch.Difficulty
{
internal class CatchLegacyScoreProcessor : ILegacyScoreProcessor
internal class CatchLegacyScoreSimulator : ILegacyScoreSimulator
{
public int AccuracyScore { get; private set; }

10
osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
View File

@ -62,11 +62,11 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
if (ComputeLegacyScoringValues)
{
ManiaLegacyScoreProcessor sv1Processor = new ManiaLegacyScoreProcessor();
sv1Processor.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
attributes.LegacyComboScore = sv1Processor.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
ManiaLegacyScoreSimulator sv1Simulator = new ManiaLegacyScoreSimulator();
sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
attributes.LegacyComboScore = sv1Simulator.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
}
return attributes;

2
osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreProcessor.cs → osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyScoreSimulator.cs
View File

@ -10,7 +10,7 @@
namespace osu.Game.Rulesets.Mania.Difficulty
{
internal class ManiaLegacyScoreProcessor : ILegacyScoreProcessor
internal class ManiaLegacyScoreSimulator : ILegacyScoreSimulator
{
public int AccuracyScore => 0;
public int ComboScore { get; private set; }

2
osu.Game.Rulesets.Mania/ManiaRuleset.cs
View File

@ -302,7 +302,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
public int LegacyID => 3;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new ManiaLegacyScoreProcessor();
public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new ManiaLegacyScoreSimulator();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();

10
osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
View File

@ -111,11 +111,11 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
if (ComputeLegacyScoringValues)
{
OsuLegacyScoreProcessor sv1Processor = new OsuLegacyScoreProcessor();
sv1Processor.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
attributes.LegacyComboScore = sv1Processor.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
OsuLegacyScoreSimulator sv1Simulator = new OsuLegacyScoreSimulator();
sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
attributes.LegacyComboScore = sv1Simulator.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
}
return attributes;

2
osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreProcessor.cs → osu.Game.Rulesets.Osu/Difficulty/OsuLegacyScoreSimulator.cs
View File

@ -14,7 +14,7 @@
namespace osu.Game.Rulesets.Osu.Difficulty
{
internal class OsuLegacyScoreProcessor : ILegacyScoreProcessor
internal class OsuLegacyScoreSimulator : ILegacyScoreSimulator
{
public int AccuracyScore { get; private set; }

2
osu.Game.Rulesets.Osu/OsuRuleset.cs
View File

@ -253,7 +253,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
public int LegacyID => 0;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new OsuLegacyScoreSimulator();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();

10
osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
View File

@ -101,11 +101,11 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
if (ComputeLegacyScoringValues)
{
TaikoLegacyScoreProcessor sv1Processor = new TaikoLegacyScoreProcessor();
sv1Processor.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Processor.AccuracyScore;
attributes.LegacyComboScore = sv1Processor.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio;
TaikoLegacyScoreSimulator sv1Simulator = new TaikoLegacyScoreSimulator();
sv1Simulator.Simulate(workingBeatmap, beatmap, mods);
attributes.LegacyAccuracyScore = sv1Simulator.AccuracyScore;
attributes.LegacyComboScore = sv1Simulator.ComboScore;
attributes.LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio;
}
return attributes;

2
osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreProcessor.cs → osu.Game.Rulesets.Taiko/Difficulty/TaikoLegacyScoreSimulator.cs
View File

@ -14,7 +14,7 @@
namespace osu.Game.Rulesets.Taiko.Difficulty
{
internal class TaikoLegacyScoreProcessor : ILegacyScoreProcessor
internal class TaikoLegacyScoreSimulator : ILegacyScoreSimulator
{
public int AccuracyScore { get; private set; }

2
osu.Game.Rulesets.Taiko/TaikoRuleset.cs
View File

@ -197,7 +197,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
public int LegacyID => 1;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new TaikoLegacyScoreProcessor();
public ILegacyScoreSimulator CreateLegacyScoreSimulator() => new TaikoLegacyScoreSimulator();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();

10
osu.Game/Database/StandardisedScoreMigrationTools.cs
View File

@ -205,15 +205,15 @@ public static long ConvertFromLegacyTotalScore(ScoreInfo score, BeatmapManager b
if (ruleset is not ILegacyRuleset legacyRuleset)
return score.TotalScore;
ILegacyScoreProcessor sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
ILegacyScoreSimulator sv1Simulator = legacyRuleset.CreateLegacyScoreSimulator();
sv1Processor.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
sv1Simulator.Simulate(beatmap, beatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods), score.Mods);
return ConvertFromLegacyTotalScore(score, new DifficultyAttributes
{
LegacyAccuracyScore = sv1Processor.AccuracyScore,
LegacyComboScore = sv1Processor.ComboScore,
LegacyBonusScoreRatio = sv1Processor.BonusScoreRatio
LegacyAccuracyScore = sv1Simulator.AccuracyScore,
LegacyComboScore = sv1Simulator.ComboScore,
LegacyBonusScoreRatio = sv1Simulator.BonusScoreRatio
});
}

2
osu.Game/Rulesets/ILegacyRuleset.cs
View File

@ -14,6 +14,6 @@ public interface ILegacyRuleset
/// </summary>
int LegacyID { get; }
ILegacyScoreProcessor CreateLegacyScoreProcessor();
ILegacyScoreSimulator CreateLegacyScoreSimulator();
}
}

5
osu.Game/Rulesets/Scoring/ILegacyScoreProcessor.cs → osu.Game/Rulesets/Scoring/ILegacyScoreSimulator.cs
View File

@ -7,7 +7,10 @@
namespace osu.Game.Rulesets.Scoring
{
public interface ILegacyScoreProcessor
/// <summary>
/// Generates attributes which are required to calculate old-style Score V1 scores.
/// </summary>
public interface ILegacyScoreSimulator
{
/// <summary>
/// The accuracy portion of the legacy (ScoreV1) total score.