From bb08bf10a08d86bc214dc333988bd77a46a142d1 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Sat, 22 Dec 2018 16:26:27 +0900 Subject: [PATCH] Fix post-merge issues --- osu.Game.Tests/Visual/TestCaseMultiResults.cs | 16 ++++-------- .../Screens/Multi/Ranking/MultiResults.cs | 8 +++--- .../Ranking/Pages/RoomRankingResultsPage.cs | 2 +- ...sultType.cs => RoomLeaderboardPageInfo.cs} | 9 ++++--- osu.Game/Screens/Play/Player.cs | 5 +++- .../Ranking/{Pages => }/ResultsPage.cs | 2 +- osu.Game/Screens/Ranking/Types/IResultType.cs | 15 ----------- .../Ranking/Types/RankingResultType.cs | 26 ------------------- .../Screens/Ranking/Types/ScoreResultType.cs | 26 ------------------- 9 files changed, 20 insertions(+), 89 deletions(-) rename osu.Game/Screens/Multi/Ranking/Types/{RoomRankingResultType.cs => RoomLeaderboardPageInfo.cs} (76%) rename osu.Game/Screens/Ranking/{Pages => }/ResultsPage.cs (98%) delete mode 100644 osu.Game/Screens/Ranking/Types/IResultType.cs delete mode 100644 osu.Game/Screens/Ranking/Types/RankingResultType.cs delete mode 100644 osu.Game/Screens/Ranking/Types/ScoreResultType.cs diff --git a/osu.Game.Tests/Visual/TestCaseMultiResults.cs b/osu.Game.Tests/Visual/TestCaseMultiResults.cs index 607a8cff3e..38027e0bc3 100644 --- a/osu.Game.Tests/Visual/TestCaseMultiResults.cs +++ b/osu.Game.Tests/Visual/TestCaseMultiResults.cs @@ -14,8 +14,7 @@ using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Ranking; using osu.Game.Screens.Multi.Ranking.Pages; using osu.Game.Screens.Multi.Ranking.Types; -using osu.Game.Screens.Ranking.Pages; -using osu.Game.Screens.Ranking.Types; +using osu.Game.Screens.Ranking; using osu.Game.Users; namespace osu.Game.Tests.Visual @@ -25,7 +24,7 @@ namespace osu.Game.Tests.Visual public override IReadOnlyList RequiredTypes => new[] { typeof(MultiResults), - typeof(RoomRankingResultType), + typeof(RoomLeaderboardPageInfo), typeof(RoomRankingResultsPage) }; @@ -60,21 +59,16 @@ namespace osu.Game.Tests.Visual this.room = room; } - protected override IEnumerable CreateResultTypes() => new IResultType[] - { - new ScoreResultType(Score, Beatmap), - new RankingResultType(Score, Beatmap), - new TestRoomRankingResultType(Score, Beatmap, room), - }; + protected override IEnumerable CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap, room) }; } - private class TestRoomRankingResultType : RoomRankingResultType + private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo { private readonly ScoreInfo score; private readonly WorkingBeatmap beatmap; private readonly Room room; - public TestRoomRankingResultType(ScoreInfo score, WorkingBeatmap beatmap, Room room) + public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap, Room room) : base(score, beatmap, room) { this.score = score; diff --git a/osu.Game/Screens/Multi/Ranking/MultiResults.cs b/osu.Game/Screens/Multi/Ranking/MultiResults.cs index 4358943057..0fffe250bf 100644 --- a/osu.Game/Screens/Multi/Ranking/MultiResults.cs +++ b/osu.Game/Screens/Multi/Ranking/MultiResults.cs @@ -20,11 +20,11 @@ namespace osu.Game.Screens.Multi.Ranking this.room = room; } - protected override IEnumerable CreateResultTypes() => new IResultType[] + protected override IEnumerable CreateResultPages() => new IResultPageInfo[] { - new ScoreResultType(Score, Beatmap), - new RankingResultType(Score, Beatmap), - new RoomRankingResultType(Score, Beatmap, room), + new ScoreOverviewPageInfo(Score, Beatmap), + new BeatmapLeaderboardPageInfo(Score, Beatmap), + new RoomLeaderboardPageInfo(Score, Beatmap, room), }; } } diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomRankingResultsPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomRankingResultsPage.cs index e277a83bb4..a3836ed82a 100644 --- a/osu.Game/Screens/Multi/Ranking/Pages/RoomRankingResultsPage.cs +++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomRankingResultsPage.cs @@ -16,7 +16,7 @@ using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.Multiplayer; using osu.Game.Scoring; using osu.Game.Screens.Multi.Match.Components; -using osu.Game.Screens.Ranking.Pages; +using osu.Game.Screens.Ranking; namespace osu.Game.Screens.Multi.Ranking.Pages { diff --git a/osu.Game/Screens/Multi/Ranking/Types/RoomRankingResultType.cs b/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs similarity index 76% rename from osu.Game/Screens/Multi/Ranking/Types/RoomRankingResultType.cs rename to osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs index 963a9ff1cf..07429b0b89 100644 --- a/osu.Game/Screens/Multi/Ranking/Types/RoomRankingResultType.cs +++ b/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs @@ -6,18 +6,17 @@ using osu.Game.Graphics; using osu.Game.Online.Multiplayer; using osu.Game.Scoring; using osu.Game.Screens.Multi.Ranking.Pages; -using osu.Game.Screens.Ranking.Pages; -using osu.Game.Screens.Ranking.Types; +using osu.Game.Screens.Ranking; namespace osu.Game.Screens.Multi.Ranking.Types { - public class RoomRankingResultType : IResultType + public class RoomLeaderboardPageInfo : IResultPageInfo { private readonly ScoreInfo score; private readonly WorkingBeatmap beatmap; private readonly Room room; - public RoomRankingResultType(ScoreInfo score, WorkingBeatmap beatmap, Room room) + public RoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap, Room room) { this.score = score; this.beatmap = beatmap; @@ -26,6 +25,8 @@ namespace osu.Game.Screens.Multi.Ranking.Types public FontAwesome Icon => FontAwesome.fa_list; + public string Name => "Room Leaderboard"; + public virtual ResultsPage CreatePage() => new RoomRankingResultsPage(score, beatmap, room); } } diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 1429675ddd..f2390318b0 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -28,6 +28,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Scoring; +using osu.Game.Screens.Ranking; using osu.Game.Skinning; using osu.Game.Storyboards.Drawables; @@ -287,7 +288,7 @@ namespace osu.Game.Screens.Play if (RulesetContainer.Replay == null) scoreManager.Import(score, true); - Push(new SoloResults(score)); + Push(CreateResults(score)); onCompletionEvent = null; }); @@ -431,5 +432,7 @@ namespace osu.Game.Screens.Play if (storyboardVisible && beatmap.Storyboard.ReplacesBackground) Background?.FadeTo(0, BACKGROUND_FADE_DURATION, Easing.OutQuint); } + + protected virtual Results CreateResults(ScoreInfo score) => new SoloResults(score); } } diff --git a/osu.Game/Screens/Ranking/Pages/ResultsPage.cs b/osu.Game/Screens/Ranking/ResultsPage.cs similarity index 98% rename from osu.Game/Screens/Ranking/Pages/ResultsPage.cs rename to osu.Game/Screens/Ranking/ResultsPage.cs index 3f077f5759..08c6155557 100644 --- a/osu.Game/Screens/Ranking/Pages/ResultsPage.cs +++ b/osu.Game/Screens/Ranking/ResultsPage.cs @@ -12,7 +12,7 @@ using osu.Game.Scoring; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.Ranking.Pages +namespace osu.Game.Screens.Ranking { public abstract class ResultsPage : Container { diff --git a/osu.Game/Screens/Ranking/Types/IResultType.cs b/osu.Game/Screens/Ranking/Types/IResultType.cs deleted file mode 100644 index df574e99f1..0000000000 --- a/osu.Game/Screens/Ranking/Types/IResultType.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2007-2018 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Game.Graphics; -using osu.Game.Screens.Ranking.Pages; - -namespace osu.Game.Screens.Ranking.Types -{ - public interface IResultType - { - FontAwesome Icon { get; } - - ResultsPage CreatePage(); - } -} diff --git a/osu.Game/Screens/Ranking/Types/RankingResultType.cs b/osu.Game/Screens/Ranking/Types/RankingResultType.cs deleted file mode 100644 index a11732d324..0000000000 --- a/osu.Game/Screens/Ranking/Types/RankingResultType.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2007-2018 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Game.Beatmaps; -using osu.Game.Graphics; -using osu.Game.Scoring; -using osu.Game.Screens.Ranking.Pages; - -namespace osu.Game.Screens.Ranking.Types -{ - public class RankingResultType : IResultType - { - private readonly ScoreInfo score; - private readonly WorkingBeatmap beatmap; - - public RankingResultType(ScoreInfo score, WorkingBeatmap beatmap) - { - this.score = score; - this.beatmap = beatmap; - } - - public FontAwesome Icon => FontAwesome.fa_list; - - public ResultsPage CreatePage() => new RankingResultsPage(score, beatmap); - } -} diff --git a/osu.Game/Screens/Ranking/Types/ScoreResultType.cs b/osu.Game/Screens/Ranking/Types/ScoreResultType.cs deleted file mode 100644 index 0841365528..0000000000 --- a/osu.Game/Screens/Ranking/Types/ScoreResultType.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2007-2018 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Game.Beatmaps; -using osu.Game.Graphics; -using osu.Game.Scoring; -using osu.Game.Screens.Ranking.Pages; - -namespace osu.Game.Screens.Ranking.Types -{ - public class ScoreResultType : IResultType - { - private readonly ScoreInfo score; - private readonly WorkingBeatmap beatmap; - - public ScoreResultType(ScoreInfo score, WorkingBeatmap beatmap) - { - this.score = score; - this.beatmap = beatmap; - } - - public FontAwesome Icon => FontAwesome.fa_asterisk; - - public ResultsPage CreatePage() => new ScoreResultsPage(score, beatmap); - } -}