From 4b26a33a3c62fcf37c900d9106d68a20d0cc3d2d Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 22:55:31 +0900 Subject: [PATCH 01/10] update netstandard version --- osu.Game.Templates.csproj | 2 +- .../osu.Game.Rulesets.EmptyFreeform.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.csproj | 2 +- .../osu.Game.Rulesets.EmptyScrolling.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Game.Templates.csproj b/osu.Game.Templates.csproj index a2abd8d..ef9715b 100644 --- a/osu.Game.Templates.csproj +++ b/osu.Game.Templates.csproj @@ -11,7 +11,7 @@ Copyright (c) 2019 ppy Pty Ltd Templates to use when creating a ruleset for consumption in osu!. dotnet-new;templates;osu - netstandard2.0 + netstandard2.1 true false content diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj index 0752f37..a782f3f 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 osu.Game.Rulesets.Sample Library AnyCPU diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index 8af4bdf..b76e17d 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 osu.Game.Rulesets.Sample Library AnyCPU diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj index ba51882..6e5c205 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 osu.Game.Rulesets.Sample Library AnyCPU diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index 8af4bdf..b76e17d 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 osu.Game.Rulesets.Sample Library AnyCPU From 7fc6d109763c0422c600ce033afba6b4262d2fc3 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 22:57:39 +0900 Subject: [PATCH 02/10] Change .netcore version --- build/cakebuild.csproj | 2 +- .../osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json | 4 ++-- .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json | 4 ++-- .../osu.Game.Rulesets.Pippidon.Tests.csproj | 2 +- .../.vscode/launch.json | 4 ++-- .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json | 4 ++-- .../osu.Game.Rulesets.Pippidon.Tests.csproj | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/cakebuild.csproj b/build/cakebuild.csproj index d5a6d44..a642929 100644 --- a/build/cakebuild.csproj +++ b/build/cakebuild.csproj @@ -2,7 +2,7 @@ Exe true - netcoreapp2.0 + netcoreapp3.1 diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json index 2b08ad6..bc52335 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll" + "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Debug)", @@ -20,7 +20,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll" + "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Release)", diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj index 68533e2..270664a 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj @@ -20,7 +20,7 @@ WinExe - netcoreapp2.2 + netcoreapp3.1 osu.Game.Rulesets.EmptyFreeform.Tests \ No newline at end of file diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json index b8ce6b2..9e3a6e9 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Pippidon.Tests.dll" + "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Pippidon.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Debug)", @@ -20,7 +20,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Pippidon.Tests.dll" + "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Pippidon.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Release)", diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj index a6cf766..98d2b93 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj @@ -20,7 +20,7 @@ WinExe - netcoreapp2.2 + netcoreapp3.1 osu.Game.Rulesets.Pippidon.Tests \ No newline at end of file diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json index 511b1d6..7a2c343 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.EmptyScrolling.Tests.dll" + "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.EmptyScrolling.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Debug)", @@ -20,7 +20,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.EmptyScrolling.Tests.dll" + "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.EmptyScrolling.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Release)", diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj index 233b30c..0977c65 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj @@ -20,7 +20,7 @@ WinExe - netcoreapp2.2 + netcoreapp3.1 osu.Game.Rulesets.EmptyScrolling.Tests \ No newline at end of file diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json index b8ce6b2..9e3a6e9 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Debug/netcoreapp2.2/osu.Game.Rulesets.Pippidon.Tests.dll" + "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Pippidon.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Debug)", @@ -20,7 +20,7 @@ "request": "launch", "program": "dotnet", "args": [ - "${workspaceRoot}/bin/Release/netcoreapp2.2/osu.Game.Rulesets.Pippidon.Tests.dll" + "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Pippidon.Tests.dll" ], "cwd": "${workspaceRoot}", "preLaunchTask": "Build (Release)", diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj index e862ab3..03646ee 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj @@ -20,7 +20,7 @@ WinExe - netcoreapp2.2 + netcoreapp3.1 osu.Game.Rulesets.Pippidon.Tests \ No newline at end of file From eaa5bae26358a54a0526b9e5248c4a025dc1b658 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 23:04:15 +0900 Subject: [PATCH 03/10] Remove ppy.osu.framework nuget. --- .../osu.Game.Rulesets.EmptyFreeform.csproj | 3 +-- .../osu.Game.Rulesets.Pippidon.csproj | 3 +-- .../osu.Game.Rulesets.EmptyScrolling.csproj | 3 +-- .../osu.Game.Rulesets.Pippidon.csproj | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj index a782f3f..9e9b65e 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj @@ -10,8 +10,7 @@ - - + diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index b76e17d..bec8159 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -10,7 +10,6 @@ - - + \ No newline at end of file diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj index 6e5c205..c3fed25 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj @@ -10,8 +10,7 @@ - - + diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj index b76e17d..bec8159 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj @@ -10,7 +10,6 @@ - - + \ No newline at end of file From 0463b3efe59344fd9592e9e77f366679d4b1df0d Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 23:04:54 +0900 Subject: [PATCH 04/10] Fix compile error --- .../osu.Game.Rulesets.Pippidon/PippidonRuleset.cs | 11 +++++------ .../Scoring/PippidonScoreProcessor.cs | 9 ++++----- .../UI/DrawablePippidonRuleset.cs | 6 +----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs index 0c853b3..ca80154 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs @@ -11,23 +11,22 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Pippidon.Beatmaps; using osu.Game.Rulesets.Pippidon.Mods; +using osu.Game.Rulesets.Pippidon.Scoring; using osu.Game.Rulesets.Pippidon.UI; +using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Pippidon { public class PippidonRuleset : Ruleset { - public PippidonRuleset(RulesetInfo rulesetInfo = null) - : base(rulesetInfo) - { - } - public override string Description => "gather the osu!coins"; - public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList mods) => + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawablePippidonRuleset(this, beatmap, mods); + public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new PippidonScoreProcessor(beatmap); + public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PippidonBeatmapConverter(beatmap); diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs index a8c8b4d..f67f2b0 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs @@ -1,16 +1,15 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Game.Rulesets.Pippidon.Objects; +using osu.Game.Beatmaps; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Pippidon.Scoring { - public class PippidonScoreProcessor : ScoreProcessor + public class PippidonScoreProcessor : ScoreProcessor { - public PippidonScoreProcessor(DrawableRuleset ruleset) - : base(ruleset) + public PippidonScoreProcessor(IBeatmap beatmap) + : base(beatmap) { } } diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs index 3043386..53ca032 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs @@ -12,8 +12,6 @@ using osu.Game.Rulesets.Pippidon.Objects; using osu.Game.Rulesets.Pippidon.Objects.Drawables; using osu.Game.Rulesets.Pippidon.Replays; -using osu.Game.Rulesets.Pippidon.Scoring; -using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Pippidon.UI @@ -21,13 +19,11 @@ namespace osu.Game.Rulesets.Pippidon.UI [Cached] public class DrawablePippidonRuleset : DrawableRuleset { - public DrawablePippidonRuleset(PippidonRuleset ruleset, IWorkingBeatmap beatmap, IReadOnlyList mods) + public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) : base(ruleset, beatmap, mods) { } - public override ScoreProcessor CreateScoreProcessor() => new PippidonScoreProcessor(this); - public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PippidonPlayfieldAdjustmentContainer(); protected override Playfield CreatePlayfield() => new PippidonPlayfield(); From 0d13d842b5129183eb90680d3db5dad3b582bed2 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 23:34:57 +0900 Subject: [PATCH 05/10] 1. Fix compile error(scrolling ruleset) 2. Fix scoreProcessor --- .../Scoring/EmptyFreeformScoreProcessor.cs | 9 ++++----- .../Scoring/EmptyScrollingScoreProcessor.cs | 9 ++++----- .../osu.Game.Rulesets.Pippidon/PippidonRuleset.cs | 11 +++++------ .../Scoring/PippidonScoreProcessor.cs | 9 ++++----- .../UI/DrawablePippidonRuleset.cs | 6 +----- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Scoring/EmptyFreeformScoreProcessor.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Scoring/EmptyFreeformScoreProcessor.cs index be5d9e3..24e3c56 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Scoring/EmptyFreeformScoreProcessor.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Scoring/EmptyFreeformScoreProcessor.cs @@ -1,16 +1,15 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Game.Rulesets.EmptyFreeform.Objects; +using osu.Game.Beatmaps; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.EmptyFreeform.Scoring { - public class EmptyFreeformScoreProcessor : ScoreProcessor + public class EmptyFreeformScoreProcessor : ScoreProcessor { - public EmptyFreeformScoreProcessor(DrawableRuleset ruleset) - : base(ruleset) + public EmptyFreeformScoreProcessor(IBeatmap beatmap) + : base(beatmap) { } diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Scoring/EmptyScrollingScoreProcessor.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Scoring/EmptyScrollingScoreProcessor.cs index 19bcded..2e0d593 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Scoring/EmptyScrollingScoreProcessor.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Scoring/EmptyScrollingScoreProcessor.cs @@ -1,16 +1,15 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Game.Rulesets.EmptyScrolling.Objects; +using osu.Game.Beatmaps; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.EmptyScrolling.Scoring { - public class EmptyScrollingScoreProcessor : ScoreProcessor + public class EmptyScrollingScoreProcessor : ScoreProcessor { - public EmptyScrollingScoreProcessor(DrawableRuleset ruleset) - : base(ruleset) + public EmptyScrollingScoreProcessor(IBeatmap beatmap) + : base(beatmap) { } diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs index df054c9..9746341 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs @@ -11,21 +11,20 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Pippidon.Beatmaps; using osu.Game.Rulesets.Pippidon.Mods; +using osu.Game.Rulesets.Pippidon.Scoring; using osu.Game.Rulesets.Pippidon.UI; +using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Pippidon { public class PippidonRuleset : Ruleset { - public PippidonRuleset(RulesetInfo rulesetInfo = null) - : base(rulesetInfo) - { - } - public override string Description => "gather the osu!coins"; - public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList mods) => new DrawablePippidonRuleset(this, beatmap, mods); + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawablePippidonRuleset(this, beatmap, mods); + + public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new PippidonScoreProcessor(beatmap); public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PippidonBeatmapConverter(beatmap); diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs index 82ddc88..9fb9fb5 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs @@ -1,16 +1,15 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using osu.Game.Rulesets.Pippidon.Objects; +using osu.Game.Beatmaps; using osu.Game.Rulesets.Scoring; -using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Pippidon.Scoring { - public class PippidonScoreProcessor : ScoreProcessor + public class PippidonScoreProcessor : ScoreProcessor { - public PippidonScoreProcessor(DrawableRuleset ruleset) - : base(ruleset) + public PippidonScoreProcessor(IBeatmap beatmap) + : base(beatmap) { } diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs index 52c9539..1b1587a 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs @@ -12,8 +12,6 @@ using osu.Game.Rulesets.Pippidon.Objects; using osu.Game.Rulesets.Pippidon.Objects.Drawables; using osu.Game.Rulesets.Pippidon.Replays; -using osu.Game.Rulesets.Pippidon.Scoring; -using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI.Scrolling; @@ -22,15 +20,13 @@ namespace osu.Game.Rulesets.Pippidon.UI [Cached] public class DrawablePippidonRuleset : DrawableScrollingRuleset { - public DrawablePippidonRuleset(PippidonRuleset ruleset, IWorkingBeatmap beatmap, IReadOnlyList mods) + public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) : base(ruleset, beatmap, mods) { Direction.Value = ScrollingDirection.Left; TimeRange.Value = 6000; } - public override ScoreProcessor CreateScoreProcessor() => new PippidonScoreProcessor(this); - protected override Playfield CreatePlayfield() => new PippidonPlayfield(); protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonFramedReplayInputHandler(replay); From 4fd495084975e34fa7713b3fdc6ae0a3ad8cbc60 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 23:40:53 +0900 Subject: [PATCH 06/10] Fix error in template. --- .../EmptyFreeformRuleset.cs | 11 +++++------ .../UI/DrawableEmptyFreeformRuleset.cs | 4 +--- .../EmptyScrollingRuleset.cs | 11 +++++------ .../UI/DrawableEmptyScrollingRuleset.cs | 4 +--- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs index 8b18413..5c1227e 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs @@ -12,7 +12,9 @@ using osu.Game.Rulesets.Difficulty; using osu.Game.Rulesets.EmptyFreeform.Beatmaps; using osu.Game.Rulesets.EmptyFreeform.Mods; +using osu.Game.Rulesets.EmptyFreeform.Scoring; using osu.Game.Rulesets.EmptyFreeform.UI; +using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.UI; using osuTK; @@ -22,16 +24,13 @@ namespace osu.Game.Rulesets.EmptyFreeform { public class EmptyFreeformRuleset : Ruleset { - public EmptyFreeformRuleset(RulesetInfo rulesetInfo = null) - : base(rulesetInfo) - { - } - public override string Description => "a very emptyfreeformruleset ruleset"; - public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList mods) => + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawableEmptyFreeformRuleset(this, beatmap, mods); + public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new EmptyFreeformScoreProcessor(beatmap); + public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new EmptyFreeformBeatmapConverter(beatmap); diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs index 3b74964..808efce 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs @@ -21,13 +21,11 @@ namespace osu.Game.Rulesets.EmptyFreeform.UI [Cached] public class DrawableEmptyFreeformRuleset : DrawableRuleset { - public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IWorkingBeatmap beatmap, IReadOnlyList mods) + public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) : base(ruleset, beatmap, mods) { } - public override ScoreProcessor CreateScoreProcessor() => new EmptyFreeformScoreProcessor(this); - protected override Playfield CreatePlayfield() => new EmptyFreeformPlayfield(); protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyFreeformFramedReplayInputHandler(replay); diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs index 2ad8a3e..94a5f3e 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs @@ -11,21 +11,20 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.EmptyScrolling.Beatmaps; using osu.Game.Rulesets.EmptyScrolling.Mods; +using osu.Game.Rulesets.EmptyFreeform.Scoring; using osu.Game.Rulesets.EmptyScrolling.UI; +using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.EmptyScrolling { public class EmptyScrollingRuleset : Ruleset { - public EmptyScrollingRuleset(RulesetInfo rulesetInfo = null) - : base(rulesetInfo) - { - } - public override string Description => "a very emptyscrolling ruleset"; - public override DrawableRuleset CreateDrawableRulesetWith(IWorkingBeatmap beatmap, IReadOnlyList mods) => new DrawableEmptyScrollingRuleset(this, beatmap, mods); + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawableEmptyScrollingRuleset(this, beatmap, mods); + + public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new EmptyScrollingScoreProcessor(beatmap); public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new EmptyScrollingBeatmapConverter(beatmap); diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs index 9c2fbe3..ea5b2a9 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs @@ -22,15 +22,13 @@ namespace osu.Game.Rulesets.EmptyScrolling.UI [Cached] public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset { - public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IWorkingBeatmap beatmap, IReadOnlyList mods) + public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) : base(ruleset, beatmap, mods) { Direction.Value = ScrollingDirection.Left; TimeRange.Value = 6000; } - public override ScoreProcessor CreateScoreProcessor() => new EmptyScrollingScoreProcessor(this); - protected override Playfield CreatePlayfield() => new EmptyScrollingPlayfield(); protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyScrollingFramedReplayInputHandler(replay); From 5720dd50ca7c124a161ddd6e4e8d0128e5681a03 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sat, 21 Dec 2019 23:56:39 +0900 Subject: [PATCH 07/10] Fix error --- .../osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs index 94a5f3e..86fd303 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs @@ -11,7 +11,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.EmptyScrolling.Beatmaps; using osu.Game.Rulesets.EmptyScrolling.Mods; -using osu.Game.Rulesets.EmptyFreeform.Scoring; +using osu.Game.Rulesets.EmptyScrolling.Scoring; using osu.Game.Rulesets.EmptyScrolling.UI; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; From ccaa929d94f2a2bfebc0f9f5c754b455fd8f2731 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 22 Dec 2019 10:02:44 +0900 Subject: [PATCH 08/10] update appveyor image --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 177f6a7..f911d67 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ clone_depth: 1 version: '{branch}-{build}' -image: Previous Visual Studio 2017 +image: Visual Studio 2019 test: off build_script: -- cmd: PowerShell -Version 2.0 .\build.ps1 \ No newline at end of file + - cmd: PowerShell -Version 2.0 .\build.ps1 From dc2e679c480c00eb9449b5a9ad68e9fa5fb8a6e6 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 22 Dec 2019 10:19:45 +0900 Subject: [PATCH 09/10] Remove unnecessary refrence --- .../UI/DrawableEmptyFreeformRuleset.cs | 2 -- .../UI/DrawableEmptyScrollingRuleset.cs | 2 -- 2 files changed, 4 deletions(-) diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs index 808efce..9c14724 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs @@ -10,10 +10,8 @@ using osu.Game.Rulesets.EmptyFreeform.Objects; using osu.Game.Rulesets.EmptyFreeform.Objects.Drawables; using osu.Game.Rulesets.EmptyFreeform.Replays; -using osu.Game.Rulesets.EmptyFreeform.Scoring; using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Objects.Drawables; -using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.EmptyFreeform.UI diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs index ea5b2a9..40d09ac 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs @@ -12,8 +12,6 @@ using osu.Game.Rulesets.EmptyScrolling.Objects; using osu.Game.Rulesets.EmptyScrolling.Objects.Drawables; using osu.Game.Rulesets.EmptyScrolling.Replays; -using osu.Game.Rulesets.EmptyScrolling.Scoring; -using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI.Scrolling; From 46173743c412366ce264b3cd2425c7ca6782925d Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 22 Dec 2019 10:41:19 +0900 Subject: [PATCH 10/10] add null as default parameter . --- .../osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs | 2 +- .../UI/DrawableEmptyFreeformRuleset.cs | 2 +- .../osu.Game.Rulesets.Pippidon/PippidonRuleset.cs | 2 +- .../osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs | 2 +- .../osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs | 2 +- .../UI/DrawableEmptyScrollingRuleset.cs | 2 +- .../osu.Game.Rulesets.Pippidon/PippidonRuleset.cs | 2 +- .../osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs index 5c1227e..9954c37 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs @@ -26,7 +26,7 @@ public class EmptyFreeformRuleset : Ruleset { public override string Description => "a very emptyfreeformruleset ruleset"; - public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods = null) => new DrawableEmptyFreeformRuleset(this, beatmap, mods); public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new EmptyFreeformScoreProcessor(beatmap); diff --git a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs index 9c14724..290f35f 100644 --- a/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs +++ b/templates/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs @@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.EmptyFreeform.UI [Cached] public class DrawableEmptyFreeformRuleset : DrawableRuleset { - public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) + public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods = null) : base(ruleset, beatmap, mods) { } diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs index ca80154..9992133 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs @@ -22,7 +22,7 @@ public class PippidonRuleset : Ruleset { public override string Description => "gather the osu!coins"; - public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods = null) => new DrawablePippidonRuleset(this, beatmap, mods); public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new PippidonScoreProcessor(beatmap); diff --git a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs index 53ca032..d923963 100644 --- a/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs +++ b/templates/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs @@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Pippidon.UI [Cached] public class DrawablePippidonRuleset : DrawableRuleset { - public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) + public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods = null) : base(ruleset, beatmap, mods) { } diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs index 86fd303..baab330 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs @@ -22,7 +22,7 @@ public class EmptyScrollingRuleset : Ruleset { public override string Description => "a very emptyscrolling ruleset"; - public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawableEmptyScrollingRuleset(this, beatmap, mods); + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods = null) => new DrawableEmptyScrollingRuleset(this, beatmap, mods); public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new EmptyScrollingScoreProcessor(beatmap); diff --git a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs index 40d09ac..620a4ab 100644 --- a/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs +++ b/templates/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs @@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.EmptyScrolling.UI [Cached] public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset { - public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) + public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods = null) : base(ruleset, beatmap, mods) { Direction.Value = ScrollingDirection.Left; diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs index 9746341..d8f3731 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs @@ -22,7 +22,7 @@ public class PippidonRuleset : Ruleset { public override string Description => "gather the osu!coins"; - public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods) => new DrawablePippidonRuleset(this, beatmap, mods); + public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList mods = null) => new DrawablePippidonRuleset(this, beatmap, mods); public override ScoreProcessor CreateScoreProcessor(IBeatmap beatmap) => new PippidonScoreProcessor(beatmap); diff --git a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs index 1b1587a..9a73dd7 100644 --- a/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs +++ b/templates/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs @@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Pippidon.UI [Cached] public class DrawablePippidonRuleset : DrawableScrollingRuleset { - public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods) + public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList mods = null) : base(ruleset, beatmap, mods) { Direction.Value = ScrollingDirection.Left;