h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-23 02:22:55 +08:00
Code Issues Releases Wiki Activity

Move Ruleset method to ILegacyRuleset interface

Browse Source
This commit is contained in:
Dan Balasescu 2023-06-29 17:24:37 +09:00
parent 6822871dab
commit c6ad184d94
7 changed files with 17 additions and 5 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,6 +202,8 @@ namespace osu.Game.Rulesets.Catch
public int LegacyID => 2; public int LegacyID => 2;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new CatchLegacyScoreProcessor();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame(); public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this); public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);

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

@ -302,6 +302,8 @@ namespace osu.Game.Rulesets.Mania
public int LegacyID => 3; public int LegacyID => 3;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new ManiaLegacyScoreProcessor();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame(); public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo); public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);

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

@ -253,6 +253,8 @@ namespace osu.Game.Rulesets.Osu
public int LegacyID => 0; public int LegacyID => 0;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame(); public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo); public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
@ -322,7 +324,5 @@ namespace osu.Game.Rulesets.Osu
} }
public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection(); public override RulesetSetupSection CreateEditorSetupSection() => new OsuSetupSection();
public override ILegacyScoreProcessor CreateLegacyScoreProcessor() => new OsuLegacyScoreProcessor();
} }
} }

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

@ -197,6 +197,8 @@ namespace osu.Game.Rulesets.Taiko
public int LegacyID => 1; public int LegacyID => 1;
public ILegacyScoreProcessor CreateLegacyScoreProcessor() => new TaikoLegacyScoreProcessor();
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame(); public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new TaikoRulesetConfigManager(settings, RulesetInfo); public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new TaikoRulesetConfigManager(settings, RulesetInfo);

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

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Difficulty; using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -201,7 +202,10 @@ namespace osu.Game.Database
var beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo); var beatmap = beatmaps.GetWorkingBeatmap(score.BeatmapInfo);
var ruleset = score.Ruleset.CreateInstance(); var ruleset = score.Ruleset.CreateInstance();
var sv1Processor = ruleset.CreateLegacyScoreProcessor(); if (ruleset is not ILegacyRuleset legacyRuleset)
return score.TotalScore;
var sv1Processor = legacyRuleset.CreateLegacyScoreProcessor();
if (sv1Processor == null) if (sv1Processor == null)
return score.TotalScore; return score.TotalScore;

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

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Rulesets namespace osu.Game.Rulesets
{ {
public interface ILegacyRuleset public interface ILegacyRuleset
@ -11,5 +13,7 @@ namespace osu.Game.Rulesets
/// Identifies the server-side ID of a legacy ruleset. /// Identifies the server-side ID of a legacy ruleset.
/// </summary> /// </summary>
int LegacyID { get; } int LegacyID { get; }
ILegacyScoreProcessor CreateLegacyScoreProcessor();
} }
} }

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

@ -380,7 +380,5 @@ namespace osu.Game.Rulesets
/// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen. /// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen.
/// </summary> /// </summary>
public virtual RulesetSetupSection? CreateEditorSetupSection() => null; public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
public virtual ILegacyScoreProcessor? CreateLegacyScoreProcessor() => null;
} }
} }