Merge branch 'master' into custom-ipc-location

global.json

@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.48"
+    "Microsoft.Build.Traversal": "2.0.50"
   }
 }

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.619.0" />
   </ItemGroup>
 </Project>

osu.Android/OsuGameAndroid.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Android.App;
+using Android.OS;
 using osu.Game;
 using osu.Game.Updater;
 
@@ -18,9 +19,32 @@ namespace osu.Android
 
                 try
                 {
-                    // todo: needs checking before play store redeploy.
+                    // We store the osu! build number in the "VersionCode" field to better support google play releases.
-                    string versionName = packageInfo.VersionName;
+                    // If we were to use the main build number, it would require a new submission each time (similar to TestFlight).
-                    // undo play store version garbling
+                    // In order to do this, we should split it up and pad the numbers to still ensure sequential increase over time.
+                    //
+                    // We also need to be aware that older SDK versions store this as a 32bit int.
+                    //
+                    // Basic conversion format (as done in Fastfile): 2020.606.0 -> 202006060
+
+                    // https://stackoverflow.com/questions/52977079/android-sdk-28-versioncode-in-packageinfo-has-been-deprecated
+                    string versionName = string.Empty;
+
+                    if (Build.VERSION.SdkInt >= BuildVersionCodes.P)
+                    {
+                        versionName = packageInfo.LongVersionCode.ToString();
+                        // ensure we only read the trailing portion of long (the part we are interested in).
+                        versionName = versionName.Substring(versionName.Length - 9);
+                    }
+                    else
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        // this is required else older SDKs will report missing method exception.
+                        versionName = packageInfo.VersionCode.ToString();
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+
+                    // undo play store version garbling (as mentioned above).
                     return new Version(int.Parse(versionName.Substring(0, 4)), int.Parse(versionName.Substring(4, 4)), int.Parse(versionName.Substring(8, 1)));
                 }
                 catch
@@ -33,4 +57,4 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
     }
-}
+}

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -30,18 +30,16 @@ namespace osu.Desktop.Updater
         private static readonly Logger logger = Logger.GetLogger("updater");
 
         [BackgroundDependencyLoader]
-        private void load(NotificationOverlay notification, OsuGameBase game)
+        private void load(NotificationOverlay notification)
         {
             notificationOverlay = notification;
 
-            if (game.IsDeployedBuild)
+            Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-            {
-                Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
-                Schedule(() => Task.Run(() => checkForUpdateAsync()));
-            }
         }
 
-        private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
+        protected override async Task PerformUpdateCheck() => await checkForUpdateAsync();
+
+        private async Task checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
             // should we schedule a retry on completion of this check?
             bool scheduleRecheck = true;
@@ -83,7 +81,7 @@ namespace osu.Desktop.Updater
 
                         // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         // try again without deltas.
-                        checkForUpdateAsync(false, notification);
+                        await checkForUpdateAsync(false, notification);
                         scheduleRecheck = false;
                     }
                     else
@@ -102,7 +100,7 @@ namespace osu.Desktop.Updater
                 if (scheduleRecheck)
                 {
                     // check again in 30 minutes.
-                    Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
+                    Scheduler.AddDelayed(async () => await checkForUpdateAsync(), 60000 * 30);
                 }
             }
         }

osu.Game.Rulesets.Catch.Tests/CatchSkinColourDecodingTest.cs

@@ -17,7 +17,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             var store = new NamespacedResourceStore<byte[]>(new DllResourceStore(GetType().Assembly), "Resources/special-skin");
             var rawSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, store);
-            var skin = new CatchLegacySkinTransformer(rawSkin);
+            var skinSource = new SkinProvidingContainer(rawSkin);
+            var skin = new CatchLegacySkinTransformer(skinSource);
 
             Assert.AreEqual(new Color4(232, 185, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value);
             Assert.AreEqual(new Color4(232, 74, 35, 255), skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value);

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs

@@ -13,8 +13,10 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
     public class TestSceneCatchModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
+
         public TestSceneCatchModPerfect()
-            : base(new CatchRuleset(), new CatchModPerfect())
+            : base(new CatchModPerfect())
         {
         }
 

osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs

@@ -12,13 +12,8 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneAutoJuiceStream : PlayerTestScene
+    public class TestSceneAutoJuiceStream : TestSceneCatchPlayer
     {
-        public TestSceneAutoJuiceStream()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap

osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs

@@ -4,18 +4,12 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneBananaShower : PlayerTestScene
+    public class TestSceneBananaShower : TestSceneCatchPlayer
     {
-        public TestSceneBananaShower()
-            : base(new CatchRuleset())
-        {
-        }
-
         [Test]
         public void TestBananaShower()
         {

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs

@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneCatchPlayer : PlayerTestScene
     {
-        public TestSceneCatchPlayer()
+        protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
-            : base(new CatchRuleset())
-        {
-        }
     }
 }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs

@@ -4,18 +4,12 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchStacker : PlayerTestScene
+    public class TestSceneCatchStacker : TestSceneCatchPlayer
     {
-        public TestSceneCatchStacker()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs

@@ -9,19 +9,13 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneHyperDash : PlayerTestScene
+    public class TestSceneHyperDash : TestSceneCatchPlayer
     {
-        public TestSceneHyperDash()
-            : base(new CatchRuleset())
-        {
-        }
-
         protected override bool Autoplay => true;
 
         [Test]

osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs

@@ -7,18 +7,12 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneJuiceStream : PlayerTestScene
+    public class TestSceneJuiceStream : TestSceneCatchPlayer
     {
-        public TestSceneJuiceStream()
-            : base(new CatchRuleset())
-        {
-        }
-
         [Test]
         public void TestJuiceStreamEndingCombo()
         {

osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs

@@ -2,26 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Humanizer;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Audio;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
-    public class CatchLegacySkinTransformer : ISkin
+    public class CatchLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
+        public CatchLegacySkinTransformer(ISkinSource source)
-
+            : base(source)
-        public CatchLegacySkinTransformer(ISkin source)
         {
-            this.source = source;
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is CatchSkinComponent catchSkinComponent))
                 return null;
@@ -61,19 +56,15 @@ namespace osu.Game.Rulesets.Catch.Skinning
             return null;
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
-
-        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
             {
                 case CatchSkinColour colour:
-                    return source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
             }
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
     }
 }

osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs

@@ -10,8 +10,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 {
     public class TestSceneManiaModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
         public TestSceneManiaModPerfect()
-            : base(new ManiaRuleset(), new ManiaModPerfect())
+            : base(new ManiaModPerfect())
         {
         }
 

osu.Game.Rulesets.Mania.Tests/Resources/special-skin/skin.ini

@@ -1,6 +1,12 @@
 [General]
-Version: 2.4
+Version: 2.5
 
 [Mania]
 Keys: 4
-ColumnLineWidth: 3,1,3,1,1
+ColumnLineWidth: 3,1,3,1,1
+Hit0: mania/hit0
+Hit50: mania/hit50
+Hit100: mania/hit100
+Hit200: mania/hit200
+Hit300: mania/hit300
+Hit300g: mania/hit300g

osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneDrawableJudgement.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -16,14 +17,19 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         public TestSceneDrawableJudgement()
         {
+            var hitWindows = new ManiaHitWindows();
+
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
-                AddStep("Show " + result.GetDescription(), () => SetContents(() =>
+                if (hitWindows.IsHitResultAllowed(result))
-                    new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
+                {
-                    {
+                    AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                        Anchor = Anchor.Centre,
+                        new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
-                        Origin = Anchor.Centre,
+                        {
-                    }));
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }));
+                }
             }
         }
     }

osu.Game.Rulesets.Mania.Tests/TestSceneEditor.cs

@@ -15,8 +15,9 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         private readonly Bindable<ManiaScrollingDirection> direction = new Bindable<ManiaScrollingDirection>();
 
+        protected override Ruleset CreateEditorRuleset() => new ManiaRuleset();
+
         public TestSceneEditor()
-            : base(new ManiaRuleset())
         {
             AddStep("upwards scroll", () => direction.Value = ManiaScrollingDirection.Up);
             AddStep("downwards scroll", () => direction.Value = ManiaScrollingDirection.Down);

osu.Game.Rulesets.Mania.Tests/TestSceneManiaPlayer.cs

@@ -5,11 +5,8 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public class TestScenePlayer : PlayerTestScene
+    public class TestSceneManiaPlayer : PlayerTestScene
     {
-        public TestScenePlayer()
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
-            : base(new ManiaRuleset())
-        {
-        }
     }
 }

osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs

@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
 {
     public class HoldNoteTickJudgement : ManiaJudgement
     {
-        public override bool AffectsCombo => false;
-
         protected override int NumericResultFor(HitResult result) => 20;
 
         protected override double HealthIncreaseFor(HitResult result)

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Mania
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.2);
+
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 
         public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new ManiaPerformanceCalculator(this, beatmap, score);

osu.Game.Rulesets.Mania/Skinning/LegacyBodyPiece.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo, DrawableHitObject drawableObject)
         {
-            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
+            string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage)?.Value
                                ?? $"mania-note{FallbackColumnIndex}L";
 
             sprite = skin.GetAnimation(imageName, true, true).With(d =>

osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs

@@ -32,28 +32,28 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string lightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LightImage, 0)?.Value
+            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
-            float leftLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
+            float leftLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LeftLineWidth)
                 ?.Value ?? 1;
-            float rightLineWidth = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
+            float rightLineWidth = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.RightLineWidth)
                 ?.Value ?? 1;
 
             bool hasLeftLine = leftLineWidth > 0;
             bool hasRightLine = rightLineWidth > 0 && skin.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version)?.Value >= 2.4m
                                 || isLastColumn;
 
-            float lightPosition = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
+            float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
                                   ?? 0;
 
-            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
+            Color4 lineColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
                                 ?? Color4.White;
 
-            Color4 backgroundColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
+            Color4 backgroundColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
                                       ?? Color4.Black;
 
-            Color4 lightColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
+            Color4 lightColour = GetColumnSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
                                  ?? Color4.White;
 
             InternalChildren = new Drawable[]

osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs

@@ -26,10 +26,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string imageName = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
+            string imageName = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.ExplosionImage)?.Value
                                ?? "lightingN";
 
-            float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
+            float explosionScale = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
                                    ?? 1;
 
             // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.

osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs

@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyHitTarget : LegacyManiaElement
+    public class LegacyHitTarget : CompositeDrawable
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -28,13 +28,13 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string targetImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
+            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
                                  ?? "mania-stage-hint";
 
-            bool showJudgementLine = GetManiaSkinConfig<bool>(skin, LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
+            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
                                      ?? true;
 
-            Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
+            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
                                 ?? Color4.White;
 
             InternalChild = directionContainer = new Container

osu.Game.Rulesets.Mania/Skinning/LegacyKeyArea.cs

@@ -33,10 +33,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string upImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
+            string upImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImage)?.Value
                              ?? $"mania-key{FallbackColumnIndex}";
 
-            string downImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImageDown)?.Value
+            string downImage = GetColumnSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.KeyImageDown)?.Value
                                ?? $"mania-key{FallbackColumnIndex}D";
 
             InternalChild = directionContainer = new Container

osu.Game.Rulesets.Mania/Skinning/LegacyManiaColumnElement.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     /// <summary>
     /// A <see cref="CompositeDrawable"/> which is placed somewhere within a <see cref="Column"/>.
     /// </summary>
-    public class LegacyManiaColumnElement : LegacyManiaElement
+    public class LegacyManiaColumnElement : CompositeDrawable
     {
         [Resolved]
         protected Column Column { get; private set; }
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
             }
         }
 
-        protected override IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+        protected IBindable<T> GetColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
-            => base.GetManiaSkinConfig<T>(skin, lookup, index ?? Column.Index);
+            => skin.GetManiaSkinConfig<T>(lookup, Column.Index);
     }
 }

osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs

@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     break;
             }
 
-            string noteImage = GetManiaSkinConfig<string>(skin, lookup)?.Value
+            string noteImage = GetColumnSkinConfig<string>(skin, lookup)?.Value
                                ?? $"mania-note{FallbackColumnIndex}{suffix}";
 
             return skin.GetTexture(noteImage);

osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs

@@ -3,13 +3,14 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyStageBackground : LegacyManiaElement
+    public class LegacyStageBackground : CompositeDrawable
     {
         private Drawable leftSprite;
         private Drawable rightSprite;
@@ -22,10 +23,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            string leftImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
+            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
                                ?? "mania-stage-left";
 
-            string rightImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
+            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
                                 ?? "mania-stage-right";
 
             InternalChildren = new[]

osu.Game.Rulesets.Mania/Skinning/LegacyStageForeground.cs

@@ -4,13 +4,14 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class LegacyStageForeground : LegacyManiaElement
+    public class LegacyStageForeground : CompositeDrawable
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string bottomImage = GetManiaSkinConfig<string>(skin, LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
+            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
                                  ?? "mania-stage-bottom";
 
             sprite = skin.GetAnimation(bottomImage, true, true)?.With(d =>

osu.Game.Rulesets.Mania/Skinning/ManiaLegacySkinTransformer.cs

@@ -3,22 +3,49 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    public class ManiaLegacySkinTransformer : ISkin
+    public class ManiaLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
         private readonly ManiaBeatmap beatmap;
 
+        /// <summary>
+        /// Mapping of <see cref="HitResult"/> to their corresponding
+        /// <see cref="LegacyManiaSkinConfigurationLookups"/> value.
+        /// </summary>
+        private static readonly IReadOnlyDictionary<HitResult, LegacyManiaSkinConfigurationLookups> hitresult_mapping
+            = new Dictionary<HitResult, LegacyManiaSkinConfigurationLookups>
+            {
+                { HitResult.Perfect, LegacyManiaSkinConfigurationLookups.Hit300g },
+                { HitResult.Great, LegacyManiaSkinConfigurationLookups.Hit300 },
+                { HitResult.Good, LegacyManiaSkinConfigurationLookups.Hit200 },
+                { HitResult.Ok, LegacyManiaSkinConfigurationLookups.Hit100 },
+                { HitResult.Meh, LegacyManiaSkinConfigurationLookups.Hit50 },
+                { HitResult.Miss, LegacyManiaSkinConfigurationLookups.Hit0 }
+            };
+
+        /// <summary>
+        /// Mapping of <see cref="HitResult"/> to their corresponding
+        /// default filenames.
+        /// </summary>
+        private static readonly IReadOnlyDictionary<HitResult, string> default_hitresult_skin_filenames
+            = new Dictionary<HitResult, string>
+            {
+                { HitResult.Perfect, "mania-hit300g" },
+                { HitResult.Great, "mania-hit300" },
+                { HitResult.Good, "mania-hit200" },
+                { HitResult.Ok, "mania-hit100" },
+                { HitResult.Meh, "mania-hit50" },
+                { HitResult.Miss, "mania-hit0" }
+            };
+
         private Lazy<bool> isLegacySkin;
 
         /// <summary>
@@ -28,29 +55,28 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Lazy<bool> hasKeyTexture;
 
         public ManiaLegacySkinTransformer(ISkinSource source, IBeatmap beatmap)
+            : base(source)
         {
-            this.source = source;
             this.beatmap = (ManiaBeatmap)beatmap;
 
-            source.SourceChanged += sourceChanged;
+            Source.SourceChanged += sourceChanged;
             sourceChanged();
         }
 
         private void sourceChanged()
         {
-            isLegacySkin = new Lazy<bool>(() => source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
+            isLegacySkin = new Lazy<bool>(() => Source.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
-            hasKeyTexture = new Lazy<bool>(() => source.GetAnimation(
+            hasKeyTexture = new Lazy<bool>(() => Source.GetAnimation(
-                GetConfig<ManiaSkinConfigurationLookup, string>(
+                this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value
-                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value
                 ?? "mania-key1", true, true) != null);
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
                 case GameplaySkinComponent<HitResult> resultComponent:
-                    return getResult(resultComponent);
+                    return getResult(resultComponent.Component);
 
                 case ManiaSkinComponent maniaComponent:
                     if (!isLegacySkin.Value || !hasKeyTexture.Value)
@@ -95,42 +121,20 @@ namespace osu.Game.Rulesets.Mania.Skinning
             return null;
         }
 
-        private Drawable getResult(GameplaySkinComponent<HitResult> resultComponent)
+        private Drawable getResult(HitResult result)
         {
-            switch (resultComponent.Component)
+            string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
-            {
+                              ?? default_hitresult_skin_filenames[result];
-                case HitResult.Miss:
-                    return this.GetAnimation("mania-hit0", true, true);
 
-                case HitResult.Meh:
+            return this.GetAnimation(filename, true, true);
-                    return this.GetAnimation("mania-hit50", true, true);
-
-                case HitResult.Ok:
-                    return this.GetAnimation("mania-hit100", true, true);
-
-                case HitResult.Good:
-                    return this.GetAnimation("mania-hit200", true, true);
-
-                case HitResult.Great:
-                    return this.GetAnimation("mania-hit300", true, true);
-
-                case HitResult.Perfect:
-                    return this.GetAnimation("mania-hit300g", true, true);
-            }
-
-            return null;
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
-
-        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return source.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
+                return Source.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
     }
 }

osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs

@@ -2,15 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
 {
-    /// <summary>
+    public static class ManiaSkinConfigExtensions
-    /// A mania legacy skin element.
-    /// </summary>
-    public class LegacyManiaElement : CompositeDrawable
     {
         /// <summary>
         /// Retrieve a per-column-count skin configuration.
@@ -18,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// <param name="skin">The skin from which configuration is retrieved.</param>
         /// <param name="lookup">The value to retrieve.</param>
         /// <param name="index">If not null, denotes the index of the column to which the entry applies.</param>
-        protected virtual IBindable<T> GetManiaSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
             => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
                 new ManiaSkinConfigurationLookup(lookup, index));
     }

osu.Game.Rulesets.Osu.Tests/Mods/OsuModTestScene.cs

@@ -0,0 +1,12 @@
+// 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.
+
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class OsuModTestScene : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+    }
+}

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs

@@ -9,17 +9,11 @@ using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDifficultyAdjust : ModTestScene
+    public class TestSceneOsuModDifficultyAdjust : OsuModTestScene
     {
-        public TestSceneOsuModDifficultyAdjust()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs

@@ -4,17 +4,11 @@
 using NUnit.Framework;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDoubleTime : ModTestScene
+    public class TestSceneOsuModDoubleTime : OsuModTestScene
     {
-        public TestSceneOsuModDoubleTime()
-            : base(new OsuRuleset())
-        {
-        }
-
         [TestCase(0.5)]
         [TestCase(1.01)]
         [TestCase(1.5)]

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs

@@ -8,18 +8,12 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModHidden : ModTestScene
+    public class TestSceneOsuModHidden : OsuModTestScene
     {
-        public TestSceneOsuModHidden()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
         {

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs

@@ -13,8 +13,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
         public TestSceneOsuModPerfect()
-            : base(new OsuRuleset(), new OsuModPerfect())
+            : base(new OsuModPerfect())
         {
         }
 

osu.Game.Rulesets.Osu.Tests/TestSceneEditor.cs

@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
     {
-        public TestSceneEditor()
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
-            : base(new OsuRuleset())
-        {
-        }
     }
 }

osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs

@@ -4,19 +4,13 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneHitCircleLongCombo : PlayerTestScene
+    public class TestSceneHitCircleLongCombo : TestSceneOsuPlayer
     {
-        public TestSceneHitCircleLongCombo()
-            : base(new OsuRuleset())
-        {
-        }
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap

osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs

@@ -19,10 +19,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneMissHitWindowJudgements : ModTestScene
     {
-        public TestSceneMissHitWindowJudgements()
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-            : base(new OsuRuleset())
-        {
-        }
 
         [Test]
         public void TestMissViaEarlyHit()

osu.Game.Rulesets.Osu.Tests/TestSceneOsuPlayer.cs

@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Osu.Tests
     [TestFixture]
     public class TestSceneOsuPlayer : PlayerTestScene
     {
-        public TestSceneOsuPlayer()
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-            : base(new OsuRuleset())
-        {
-        }
     }
 }

osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs

@@ -25,13 +25,12 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneSkinFallbacks : PlayerTestScene
+    public class TestSceneSkinFallbacks : TestSceneOsuPlayer
     {
         private readonly TestSource testUserSkin;
         private readonly TestSource testBeatmapSkin;
 
         public TestSceneSkinFallbacks()
-            : base(new OsuRuleset())
         {
             testUserSkin = new TestSource("user");
             testBeatmapSkin = new TestSource("beatmap");

osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs

@@ -2,20 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Audio;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
-    public class OsuLegacySkinTransformer : ISkin
+    public class OsuLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkin source;
-
         private Lazy<bool> hasHitCircle;
 
         /// <summary>
@@ -26,19 +21,18 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public const float LEGACY_CIRCLE_RADIUS = 64 - 5;
 
         public OsuLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
-            this.source = source;
+            Source.SourceChanged += sourceChanged;
-
-            source.SourceChanged += sourceChanged;
             sourceChanged();
         }
 
         private void sourceChanged()
         {
-            hasHitCircle = new Lazy<bool>(() => source.GetTexture("hitcircle") != null);
+            hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is OsuSkinComponent osuComponent))
                 return null;
@@ -85,13 +79,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     return null;
 
                 case OsuSkinComponents.Cursor:
-                    if (source.GetTexture("cursor") != null)
+                    if (Source.GetTexture("cursor") != null)
                         return new LegacyCursor();
 
                     return null;
 
                 case OsuSkinComponents.CursorTrail:
-                    if (source.GetTexture("cursortrail") != null)
+                    if (Source.GetTexture("cursortrail") != null)
                         return new LegacyCursorTrail();
 
                     return null;
@@ -102,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                     return !hasFont(font)
                         ? null
-                        : new LegacySpriteText(source, font)
+                        : new LegacySpriteText(Source, font)
                         {
                             // stable applies a blanket 0.8x scale to hitcircle fonts
                             Scale = new Vector2(0.8f),
@@ -113,16 +107,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             return null;
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
-
-        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
             {
                 case OsuSkinColour colour:
-                    return source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
 
                 case OsuSkinConfiguration osuLookup:
                     switch (osuLookup)
@@ -136,16 +126,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         case OsuSkinConfiguration.HitCircleOverlayAboveNumber:
                             // See https://osu.ppy.sh/help/wiki/Skinning/skin.ini#%5Bgeneral%5D
                             // HitCircleOverlayAboveNumer (with typo) should still be supported for now.
-                            return source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
+                            return Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumber) ??
-                                   source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
+                                   Source.GetConfig<OsuSkinConfiguration, TValue>(OsuSkinConfiguration.HitCircleOverlayAboveNumer);
                     }
 
                     break;
             }
 
-            return source.GetConfig<TLookup, TValue>(lookup);
+            return Source.GetConfig<TLookup, TValue>(lookup);
         }
 
-        private bool hasFont(string fontName) => source.GetTexture($"{fontName}-0") != null;
+        private bool hasFont(string fontName) => Source.GetTexture($"{fontName}-0") != null;
     }
 }

osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs

@@ -12,8 +12,10 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
 {
     public class TestSceneTaikoModPerfect : ModPerfectTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new TestTaikoRuleset();
+
         public TestSceneTaikoModPerfect()
-            : base(new TestTaikoRuleset(), new TaikoModPerfect())
+            : base(new TaikoModPerfect())
         {
         }
 

osu.Game.Rulesets.Taiko.Tests/TestSceneEditor.cs

@@ -9,9 +9,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
     [TestFixture]
     public class TestSceneEditor : EditorTestScene
     {
-        public TestSceneEditor()
+        protected override Ruleset CreateEditorRuleset() => new TaikoRuleset();
-            : base(new TaikoRuleset())
-        {
-        }
     }
 }

osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs

@@ -6,7 +6,6 @@ using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
@@ -14,13 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
     /// Taiko has some interesting rules for legacy mappings.
     /// </summary>
     [HeadlessTest]
-    public class TestSceneSampleOutput : PlayerTestScene
+    public class TestSceneSampleOutput : TestSceneTaikoPlayer
     {
-        public TestSceneSampleOutput()
-            : base(new TaikoRuleset())
-        {
-        }
-
         public override void SetUpSteps()
         {
             base.SetUpSteps();

osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs

@@ -5,17 +5,11 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestSceneSwellJudgements : PlayerTestScene
+    public class TestSceneSwellJudgements : TestSceneTaikoPlayer
     {
-        public TestSceneSwellJudgements()
-            : base(new TaikoRuleset())
-        {
-        }
-
         [Test]
         public void TestZeroTickTimeOffsets()
         {

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayer.cs

@@ -0,0 +1,12 @@
+// 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.
+
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneTaikoPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new TaikoRuleset();
+    }
+}

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs

@@ -11,13 +11,8 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestSceneTaikoSuddenDeath : PlayerTestScene
+    public class TestSceneTaikoSuddenDeath : TestSceneTaikoPlayer
     {
-        public TestSceneTaikoSuddenDeath()
-            : base(new TaikoRuleset())
-        {
-        }
-
         protected override bool AllowFail => true;
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset)

osu.Game.Rulesets.Taiko/Skinning/TaikoLegacySkinTransformer.cs

@@ -6,23 +6,20 @@ using System.Collections.Generic;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
 {
-    public class TaikoLegacySkinTransformer : ISkin
+    public class TaikoLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ISkinSource source;
-
         public TaikoLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
-            this.source = source;
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is TaikoSkinComponent taikoComponent))
                 return null;
@@ -100,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                     return null;
             }
 
-            return source.GetDrawableComponent(component);
+            return Source.GetDrawableComponent(component);
         }
 
         private string getHitName(TaikoSkinComponents component)
@@ -120,11 +117,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             throw new ArgumentOutOfRangeException(nameof(component), "Invalid result type");
         }
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+        public override SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo) => source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source.GetConfig<TLookup, TValue>(lookup);
 
         private class LegacyTaikoSampleInfo : ISampleInfo
         {

osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs

@@ -0,0 +1,27 @@
+// 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.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneGameplayClockContainer : OsuTestScene
+    {
+        [Test]
+        public void TestStartThenElapsedTime()
+        {
+            GameplayClockContainer gcc = null;
+
+            AddStep("create container", () => Add(gcc = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0)));
+            AddStep("start track", () => gcc.Start());
+            AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0);
+        }
+    }
+}

osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs

@@ -1,58 +1,21 @@
 // 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.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Skinning;
+using osu.Game.Tests.Beatmaps;
-using osu.Game.Storyboards;
 using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneHitObjectSamples : PlayerTestScene
+    public class TestSceneHitObjectSamples : HitObjectSampleTest
     {
-        private readonly SkinInfo userSkinInfo = new SkinInfo();
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
-
+        protected override IResourceStore<byte[]> Resources => TestResources.GetStore();
-        private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
-        {
-            BeatmapSet = new BeatmapSetInfo(),
-            Metadata = new BeatmapMetadata
-            {
-                Author = User.SYSTEM_USER
-            }
-        };
-
-        private readonly TestResourceStore userSkinResourceStore = new TestResourceStore();
-        private readonly TestResourceStore beatmapSkinResourceStore = new TestResourceStore();
-
-        protected override bool HasCustomSteps => true;
-
-        public TestSceneHitObjectSamples()
-            : base(new OsuRuleset())
-        {
-        }
-
-        private SkinSourceDependencyContainer dependencies;
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            => new DependencyContainer(dependencies = new SkinSourceDependencyContainer(base.CreateChildDependencies(parent)));
 
         /// <summary>
         /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.
@@ -62,11 +25,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-skin-sample.osu");
+            CreateTestWithBeatmap("hitobject-skin-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -77,11 +40,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -92,11 +55,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(null, expected_sample);
+            SetupSkins(null, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -108,11 +71,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestDefaultCustomSampleFromBeatmap(string expectedSample)
         {
-            setupSkins(expectedSample, expectedSample);
+            SetupSkins(expectedSample, expectedSample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
 
-            assertBeatmapLookup(expectedSample);
+            AssertBeatmapLookup(expectedSample);
         }
 
         /// <summary>
@@ -124,11 +87,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestDefaultCustomSampleFromUserSkinFallback(string expectedSample)
         {
-            setupSkins(string.Empty, expectedSample);
+            SetupSkins(string.Empty, expectedSample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample.osu");
 
-            assertUserLookup(expectedSample);
+            AssertUserLookup(expectedSample);
         }
 
         /// <summary>
@@ -139,11 +102,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "hit_1.wav";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("file-beatmap-sample.osu");
+            CreateTestWithBeatmap("file-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -154,11 +117,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("controlpoint-skin-sample.osu");
+            CreateTestWithBeatmap("controlpoint-skin-sample.osu");
 
-            assertUserLookup(expected_sample);
+            AssertUserLookup(expected_sample);
         }
 
         /// <summary>
@@ -169,11 +132,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("controlpoint-beatmap-sample.osu");
+            CreateTestWithBeatmap("controlpoint-beatmap-sample.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
         }
 
         /// <summary>
@@ -183,11 +146,11 @@ namespace osu.Game.Tests.Gameplay
         [TestCase("normal-hitnormal")]
         public void TestControlPointCustomSampleFromBeatmap(string sampleName)
         {
-            setupSkins(sampleName, sampleName);
+            SetupSkins(sampleName, sampleName);
 
-            createTestWithBeatmap("controlpoint-beatmap-custom-sample.osu");
+            CreateTestWithBeatmap("controlpoint-beatmap-custom-sample.osu");
 
-            assertBeatmapLookup(sampleName);
+            AssertBeatmapLookup(sampleName);
         }
 
         /// <summary>
@@ -198,149 +161,11 @@ namespace osu.Game.Tests.Gameplay
         {
             const string expected_sample = "normal-hitnormal3";
 
-            setupSkins(expected_sample, expected_sample);
+            SetupSkins(expected_sample, expected_sample);
 
-            createTestWithBeatmap("hitobject-beatmap-custom-sample-override.osu");
+            CreateTestWithBeatmap("hitobject-beatmap-custom-sample-override.osu");
 
-            assertBeatmapLookup(expected_sample);
+            AssertBeatmapLookup(expected_sample);
-        }
-
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
-
-        private IBeatmap currentTestBeatmap;
-
-        private void createTestWithBeatmap(string filename)
-        {
-            CreateTest(() =>
-            {
-                AddStep("clear performed lookups", () =>
-                {
-                    userSkinResourceStore.PerformedLookups.Clear();
-                    beatmapSkinResourceStore.PerformedLookups.Clear();
-                });
-
-                AddStep($"load {filename}", () =>
-                {
-                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
-                        currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
-                });
-            });
-        }
-
-        private void setupSkins(string beatmapFile, string userFile)
-        {
-            AddStep("setup skins", () =>
-            {
-                userSkinInfo.Files = new List<SkinFileInfo>
-                {
-                    new SkinFileInfo
-                    {
-                        Filename = userFile,
-                        FileInfo = new IO.FileInfo { Hash = userFile }
-                    }
-                };
-
-                beatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>
-                {
-                    new BeatmapSetFileInfo
-                    {
-                        Filename = beatmapFile,
-                        FileInfo = new IO.FileInfo { Hash = beatmapFile }
-                    }
-                };
-
-                // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
-            });
-        }
-
-        private void assertBeatmapLookup(string name) => AddAssert($"\"{name}\" looked up from beatmap skin",
-            () => !userSkinResourceStore.PerformedLookups.Contains(name) && beatmapSkinResourceStore.PerformedLookups.Contains(name));
-
-        private void assertUserLookup(string name) => AddAssert($"\"{name}\" looked up from user skin",
-            () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && userSkinResourceStore.PerformedLookups.Contains(name));
-
-        private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
-        {
-            public ISkinSource SkinSource;
-
-            private readonly IReadOnlyDependencyContainer fallback;
-
-            public SkinSourceDependencyContainer(IReadOnlyDependencyContainer fallback)
-            {
-                this.fallback = fallback;
-            }
-
-            public object Get(Type type)
-            {
-                if (type == typeof(ISkinSource))
-                    return SkinSource;
-
-                return fallback.Get(type);
-            }
-
-            public object Get(Type type, CacheInfo info)
-            {
-                if (type == typeof(ISkinSource))
-                    return SkinSource;
-
-                return fallback.Get(type, info);
-            }
-
-            public void Inject<T>(T instance) where T : class
-            {
-                // Never used directly
-            }
-        }
-
-        private class TestResourceStore : IResourceStore<byte[]>
-        {
-            public readonly List<string> PerformedLookups = new List<string>();
-
-            public byte[] Get(string name)
-            {
-                markLookup(name);
-                return Array.Empty<byte>();
-            }
-
-            public Task<byte[]> GetAsync(string name)
-            {
-                markLookup(name);
-                return Task.FromResult(Array.Empty<byte>());
-            }
-
-            public Stream GetStream(string name)
-            {
-                markLookup(name);
-                return new MemoryStream();
-            }
-
-            private void markLookup(string name) => PerformedLookups.Add(name.Substring(name.LastIndexOf(Path.DirectorySeparatorChar) + 1));
-
-            public IEnumerable<string> GetAvailableResources() => Enumerable.Empty<string>();
-
-            public void Dispose()
-            {
-            }
-        }
-
-        private class TestWorkingBeatmap : ClockBackedTestWorkingBeatmap
-        {
-            private readonly BeatmapInfo skinBeatmapInfo;
-            private readonly IResourceStore<byte[]> resourceStore;
-
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio,
-                                      double length = 60000)
-                : base(beatmap, storyboard, referenceClock, audio, length)
-            {
-                this.skinBeatmapInfo = skinBeatmapInfo;
-                this.resourceStore = resourceStore;
-            }
-
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
         }
     }
 }

osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs

@@ -1,6 +1,7 @@
 // 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.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -10,7 +11,12 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
@@ -43,6 +49,27 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("sample is non-null", () => channel != null);
         }
 
+        [Test]
+        public void TestSamplePlaybackAtZero()
+        {
+            GameplayClockContainer gameplayContainer = null;
+            DrawableStoryboardSample sample = null;
+
+            AddStep("create container", () =>
+            {
+                Add(gameplayContainer = new GameplayClockContainer(CreateWorkingBeatmap(new OsuRuleset().RulesetInfo), Array.Empty<Mod>(), 0));
+
+                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                {
+                    Clock = gameplayContainer.GameplayClock
+                });
+            });
+
+            AddStep("start time", () => gameplayContainer.Start());
+
+            AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
+        }
+
         private class TestSkin : LegacySkin
         {
             public TestSkin(string resourceName, AudioManager audioManager)
@@ -60,11 +87,11 @@ namespace osu.Game.Tests.Gameplay
                 this.resourceName = resourceName;
             }
 
-            public byte[] Get(string name) => name == resourceName ? TestResources.GetStore().Get("Resources/test-sample.mp3") : null;
+            public byte[] Get(string name) => name == resourceName ? TestResources.GetStore().Get("Resources/Samples/test-sample.mp3") : null;
 
-            public Task<byte[]> GetAsync(string name) => name == resourceName ? TestResources.GetStore().GetAsync("Resources/test-sample.mp3") : null;
+            public Task<byte[]> GetAsync(string name) => name == resourceName ? TestResources.GetStore().GetAsync("Resources/Samples/test-sample.mp3") : null;
 
-            public Stream GetStream(string name) => name == resourceName ? TestResources.GetStore().GetStream("Resources/test-sample.mp3") : null;
+            public Stream GetStream(string name) => name == resourceName ? TestResources.GetStore().GetStream("Resources/Samples/test-sample.mp3") : null;
 
             public IEnumerable<string> GetAvailableResources() => new[] { resourceName };
 

osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs

@@ -0,0 +1,95 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Configuration.Tracking;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Configuration;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Testing
+{
+    /// <summary>
+    /// A test scene ensuring the dependencies for the
+    /// provided ruleset below are cached at the base implementation.
+    /// </summary>
+    [HeadlessTest]
+    public class TestSceneRulesetDependencies : OsuTestScene
+    {
+        protected override Ruleset CreateRuleset() => new TestRuleset();
+
+        [Test]
+        public void TestRetrieveTexture()
+        {
+            AddAssert("ruleset texture retrieved", () =>
+                Dependencies.Get<TextureStore>().Get(@"test-image") != null);
+        }
+
+        [Test]
+        public void TestRetrieveSample()
+        {
+            AddAssert("ruleset sample retrieved", () =>
+                Dependencies.Get<ISampleStore>().Get(@"test-sample") != null);
+        }
+
+        [Test]
+        public void TestResolveConfigManager()
+        {
+            AddAssert("ruleset config resolved", () =>
+                Dependencies.Get<TestRulesetConfigManager>() != null);
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override string Description => string.Empty;
+            public override string ShortName => string.Empty;
+
+            public TestRuleset()
+            {
+                // temporary ID to let RulesetConfigCache pass our
+                // config manager to the ruleset dependencies.
+                RulesetInfo.ID = -1;
+            }
+
+            public override IResourceStore<byte[]> CreateResourceStore() => new NamespacedResourceStore<byte[]>(TestResources.GetStore(), @"Resources");
+            public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new TestRulesetConfigManager();
+
+            public override IEnumerable<Mod> GetModsFor(ModType type) => Array.Empty<Mod>();
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => null;
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => null;
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => null;
+        }
+
+        private class TestRulesetConfigManager : IRulesetConfigManager
+        {
+            public void Load()
+            {
+            }
+
+            public bool Save() => true;
+
+            public TrackedSettings CreateTrackedSettings() => new TrackedSettings();
+
+            public void LoadInto(TrackedSettings settings)
+            {
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
@@ -13,13 +14,10 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : EditorTestScene
     {
-        public TestSceneEditorChangeStates()
-            : base(new OsuRuleset())
-        {
-        }
-
         private EditorBeatmap editorBeatmap;
 
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();

osu.Game.Tests/Visual/Gameplay/OsuPlayerTestScene.cs

@@ -0,0 +1,16 @@
+// 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.
+
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    /// <summary>
+    /// A <see cref="PlayerTestScene"/> with an arbitrary ruleset value to test with.
+    /// </summary>
+    public abstract class OsuPlayerTestScene : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+    }
+}

osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs

@@ -10,14 +10,13 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Storyboards;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneCompletionCancellation : PlayerTestScene
+    public class TestSceneCompletionCancellation : OsuPlayerTestScene
     {
         private Track track;
 
@@ -29,11 +28,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override bool AllowFail => false;
 
-        public TestSceneCompletionCancellation()
-            : base(new OsuRuleset())
-        {
-        }
-
         [SetUpSteps]
         public override void SetUpSteps()
         {

osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs

@@ -10,23 +10,17 @@ using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Storyboards;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneGameplayRewinding : PlayerTestScene
+    public class TestSceneGameplayRewinding : OsuPlayerTestScene
     {
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        public TestSceneGameplayRewinding()
-            : base(new OsuRuleset())
-        {
-        }
-
         private Track track;
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)

osu.Game.Tests/Visual/Gameplay/TestScenePause.cs

@@ -10,14 +10,13 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePause : PlayerTestScene
+    public class TestScenePause : OsuPlayerTestScene
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
@@ -26,7 +25,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override Container<Drawable> Content => content;
 
         public TestScenePause()
-            : base(new OsuRuleset())
         {
             base.Content.Add(content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both });
         }

osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs

@@ -8,12 +8,11 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
-    public class TestScenePauseWhenInactive : PlayerTestScene
+    public class TestScenePauseWhenInactive : OsuPlayerTestScene
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
@@ -27,11 +26,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private GameHost host { get; set; }
 
-        public TestScenePauseWhenInactive()
-            : base(new OsuRuleset())
-        {
-        }
-
         [Test]
         public void TestDoesntPauseDuringIntro()
         {

osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs

@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osuTK.Graphics;
@@ -100,6 +101,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new BeatmapManager BeatmapManager => base.BeatmapManager;
 
+            public new ScoreManager ScoreManager => base.ScoreManager;
+
             public new SettingsPanel Settings => base.Settings;
 
             public new MusicController MusicController => base.MusicController;

osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs

@@ -0,0 +1,155 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Scoring;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public class TestScenePresentScore : OsuGameTestScene
+    {
+        private BeatmapSetInfo beatmap;
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            AddStep("import beatmap", () =>
+            {
+                var difficulty = new BeatmapDifficulty();
+                var metadata = new BeatmapMetadata
+                {
+                    Artist = "SomeArtist",
+                    AuthorString = "SomeAuthor",
+                    Title = "import"
+                };
+
+                beatmap = Game.BeatmapManager.Import(new BeatmapSetInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineBeatmapSetID = 1,
+                    Metadata = metadata,
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = 1 * 1024,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = new OsuRuleset().RulesetInfo
+                        },
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = 1 * 2048,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = new OsuRuleset().RulesetInfo
+                        },
+                    }
+                }).Result;
+            });
+        }
+
+        [Test]
+        public void TestFromMainMenu([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            var secondimport = importScore(3);
+
+            presentAndConfirm(firstImport, type);
+            returnToMenu();
+            presentAndConfirm(secondimport, type);
+            returnToMenu();
+            returnToMenu();
+        }
+
+        [Test]
+        public void TestFromMainMenuDifferentRuleset([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            var secondimport = importScore(3, new ManiaRuleset().RulesetInfo);
+
+            presentAndConfirm(firstImport, type);
+            returnToMenu();
+            presentAndConfirm(secondimport, type);
+            returnToMenu();
+            returnToMenu();
+        }
+
+        [Test]
+        public void TestFromSongSelect([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            presentAndConfirm(firstImport, type);
+
+            var secondimport = importScore(3);
+            presentAndConfirm(secondimport, type);
+        }
+
+        [Test]
+        public void TestFromSongSelectDifferentRuleset([Values] ScorePresentType type)
+        {
+            var firstImport = importScore(1);
+            presentAndConfirm(firstImport, type);
+
+            var secondimport = importScore(3, new ManiaRuleset().RulesetInfo);
+            presentAndConfirm(secondimport, type);
+        }
+
+        private void returnToMenu()
+        {
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+        }
+
+        private Func<ScoreInfo> importScore(int i, RulesetInfo ruleset = null)
+        {
+            ScoreInfo imported = null;
+            AddStep($"import score {i}", () =>
+            {
+                imported = Game.ScoreManager.Import(new ScoreInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineScoreID = i,
+                    Beatmap = beatmap.Beatmaps.First(),
+                    Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
+                }).Result;
+            });
+
+            AddAssert($"import {i} succeeded", () => imported != null);
+
+            return () => imported;
+        }
+
+        private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type)
+        {
+            AddStep("present score", () => Game.PresentScore(getImport(), type));
+
+            switch (type)
+            {
+                case ScorePresentType.Results:
+                    AddUntilStep("wait for results", () => Game.ScreenStack.CurrentScreen is ResultsScreen);
+                    AddUntilStep("correct score displayed", () => ((ResultsScreen)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
+                    AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
+                    break;
+
+                case ScorePresentType.Gameplay:
+                    AddUntilStep("wait for player loader", () => Game.ScreenStack.CurrentScreen is ReplayPlayerLoader);
+                    AddUntilStep("correct score displayed", () => ((ReplayPlayerLoader)Game.ScreenStack.CurrentScreen).Score.ID == getImport().ID);
+                    AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Ruleset.ID);
+                    break;
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs

@@ -1,52 +1,128 @@
 // 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.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
-using osu.Game.Online.API.Requests;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Comments;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
+using osu.Framework.Graphics;
-using osu.Game.Users;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Comments;
 
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
     public class TestSceneCommentsContainer : OsuTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        public TestSceneCommentsContainer()
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
-        {
-            BasicScrollContainer scroll;
-            TestCommentsContainer comments;
 
-            Add(scroll = new BasicScrollContainer
+        private CommentsContainer commentsContainer;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+            Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = comments = new TestCommentsContainer()
+                Child = commentsContainer = new CommentsContainer()
             });
 
-            AddStep("Big Black comments", () => comments.ShowComments(CommentableType.Beatmapset, 41823));
+        [Test]
-            AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
+        public void TestIdleState()
-            AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
-            AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
-            AddStep("Trigger user change", comments.User.TriggerChange);
-            AddStep("Idle state", () =>
-            {
-                scroll.Clear();
-                scroll.Add(comments = new TestCommentsContainer());
-            });
-        }
-
-        private class TestCommentsContainer : CommentsContainer
         {
-            public new Bindable<User> User => base.User;
+            AddUntilStep("loading spinner shown",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().IsLoading);
         }
+
+        [Test]
+        public void TestSingleCommentsPage()
+        {
+            setUpCommentsResponse(exampleComments);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddUntilStep("show more button hidden",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 0);
+        }
+
+        [Test]
+        public void TestMultipleCommentPages()
+        {
+            var comments = exampleComments;
+            comments.HasMore = true;
+            comments.TopLevelCount = 10;
+
+            setUpCommentsResponse(comments);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddUntilStep("show more button visible",
+                () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 1);
+        }
+
+        [Test]
+        public void TestMultipleLoads()
+        {
+            var comments = exampleComments;
+            int topLevelCommentCount = exampleComments.Comments.Count(comment => comment.IsTopLevel);
+
+            AddStep("hide container", () => commentsContainer.Hide());
+            setUpCommentsResponse(comments);
+            AddRepeatStep("show comments multiple times",
+                () => commentsContainer.ShowComments(CommentableType.Beatmapset, 456), 2);
+            AddStep("show container", () => commentsContainer.Show());
+            AddUntilStep("comment count is correct",
+                () => commentsContainer.ChildrenOfType<DrawableComment>().Count() == topLevelCommentCount);
+        }
+
+        private void setUpCommentsResponse(CommentBundle commentBundle)
+            => AddStep("set up response", () =>
+            {
+                dummyAPI.HandleRequest = request =>
+                {
+                    if (!(request is GetCommentsRequest getCommentsRequest))
+                        return;
+
+                    getCommentsRequest.TriggerSuccess(commentBundle);
+                };
+            });
+
+        private CommentBundle exampleComments => new CommentBundle
+        {
+            Comments = new List<Comment>
+            {
+                new Comment
+                {
+                    Id = 1,
+                    Message = "This is a comment",
+                    LegacyName = "FirstUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 19,
+                    RepliesCount = 1
+                },
+                new Comment
+                {
+                    Id = 5,
+                    ParentId = 1,
+                    Message = "This is a child comment",
+                    LegacyName = "SecondUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 4,
+                },
+                new Comment
+                {
+                    Id = 10,
+                    Message = "This is another comment",
+                    LegacyName = "ThirdUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 0
+                },
+            },
+            IncludedComments = new List<Comment>(),
+        };
     }
 }

osu.Game.Tournament/Components/SongBar.cs

@@ -77,6 +77,8 @@ namespace osu.Game.Tournament.Components
                 flow = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
+                    // Todo: This is a hack for https://github.com/ppy/osu-framework/issues/3617 since this container is at the very edge of the screen and potentially initially masked away.
+                    Height = 1,
                     AutoSizeAxes = Axes.Y,
                     LayoutDuration = 500,
                     LayoutEasing = Easing.OutQuint,

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -39,6 +39,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
 
+            new KeyBinding(new[] { InputKey.Alt, InputKey.Home }, GlobalAction.Home),
+
             new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
             new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
 
@@ -152,5 +154,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Next Selection")]
         SelectNext,
+
+        [Description("Home")]
+        Home,
     }
 }

osu.Game/OsuGame.cs

@@ -35,7 +35,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Screens.Play;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.Chat;
 using osu.Game.Skinning;
@@ -43,6 +42,8 @@ using osuTK.Graphics;
 using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
@@ -360,7 +361,7 @@ namespace osu.Game
         /// Present a score's replay immediately.
         /// The user should have already requested this interactively.
         /// </summary>
-        public void PresentScore(ScoreInfo score)
+        public void PresentScore(ScoreInfo score, ScorePresentType presentType = ScorePresentType.Results)
         {
             // The given ScoreInfo may have missing properties if it was retrieved from online data. Re-retrieve it from the database
             // to ensure all the required data for presenting a replay are present.
@@ -392,9 +393,19 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
+                Ruleset.Value = databasedScore.ScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
-                screen.Push(new ReplayPlayerLoader(databasedScore));
+                switch (presentType)
+                {
+                    case ScorePresentType.Gameplay:
+                        screen.Push(new ReplayPlayerLoader(databasedScore));
+                        break;
+
+                    case ScorePresentType.Results:
+                        screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo));
+                        break;
+                }
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
@@ -611,6 +622,9 @@ namespace osu.Game
 
             loadComponentSingleFile(screenshotManager, Add);
 
+            // dependency on notification overlay, dependent by settings overlay
+            loadComponentSingleFile(CreateUpdateManager(), Add, true);
+
             // overlay elements
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(dashboard = new DashboardOverlay(), overlayContent.Add, true);
@@ -643,7 +657,6 @@ namespace osu.Game
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
-            Add(CreateUpdateManager()); // dependency on notification overlay
 
             // side overlays which cancel each other.
             var singleDisplaySideOverlays = new OverlayContainer[] { Settings, notifications };
@@ -1000,4 +1013,10 @@ namespace osu.Game
                 Exit();
         }
     }
+
+    public enum ScorePresentType
+    {
+        Results,
+        Gameplay
+    }
 }

osu.Game/Overlays/BeatmapListing/SearchGenre.cs

@@ -20,6 +20,10 @@ namespace osu.Game.Overlays.BeatmapListing
 
         [Description("Hip Hop")]
         HipHop = 9,
-        Electronic = 10
+        Electronic = 10,
+        Metal = 11,
+        Classical = 12,
+        Folk = 13,
+        Jazz = 14
     }
 }

osu.Game/Overlays/BeatmapListing/SearchLanguage.cs

@@ -11,8 +11,8 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(0)]
         Any,
 
-        [Order(11)]
+        [Order(14)]
-        Other,
+        Unspecified,
 
         [Order(1)]
         English,
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(2)]
         Chinese,
 
-        [Order(10)]
+        [Order(12)]
         Instrumental,
 
         [Order(7)]
@@ -42,6 +42,15 @@ namespace osu.Game.Overlays.BeatmapListing
         Spanish,
 
         [Order(5)]
-        Italian
+        Italian,
+
+        [Order(10)]
+        Russian,
+
+        [Order(11)]
+        Polish,
+
+        [Order(13)]
+        Other
     }
 }

osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs

@@ -78,19 +78,10 @@ namespace osu.Game.Overlays.Chat.Tabs
         /// <param name="channel">The channel that is going to be removed.</param>
         public void RemoveChannel(Channel channel)
         {
-            if (Current.Value == channel)
-            {
-                var allChannels = TabContainer.AllTabItems.Select(tab => tab.Value).ToList();
-                var isNextTabSelector = allChannels[allChannels.IndexOf(channel) + 1] == selectorTab.Value;
-
-                // selectorTab is not switchable, so we have to explicitly select it if it's the only tab left
-                if (isNextTabSelector && allChannels.Count == 2)
-                    SelectTab(selectorTab);
-                else
-                    SwitchTab(isNextTabSelector ? -1 : 1);
-            }
-
             RemoveItem(channel);
+
+            if (SelectedTab == null)
+                SelectTab(selectorTab);
         }
 
         protected override void SelectTab(TabItem<Channel> tab)

osu.Game/Overlays/Comments/CommentsContainer.cs

@@ -12,6 +12,7 @@ using osu.Game.Online.API.Requests.Responses;
 using System.Threading;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Threading;
 using osu.Game.Users;
 
 namespace osu.Game.Overlays.Comments
@@ -30,6 +31,7 @@ namespace osu.Game.Overlays.Comments
         private IAPIProvider api { get; set; }
 
         private GetCommentsRequest request;
+        private ScheduledDelegate scheduledCommentsLoad;
         private CancellationTokenSource loadCancellation;
         private int currentPage;
 
@@ -152,8 +154,9 @@ namespace osu.Game.Overlays.Comments
 
             request?.Cancel();
             loadCancellation?.Cancel();
+            scheduledCommentsLoad?.Cancel();
             request = new GetCommentsRequest(id.Value, type.Value, Sort.Value, currentPage++, 0);
-            request.Success += res => Schedule(() => onSuccess(res));
+            request.Success += res => scheduledCommentsLoad = Schedule(() => onSuccess(res));
             api.PerformAsync(request);
         }
 

osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs

@@ -1,19 +1,26 @@
 // 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.
 
+using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Configuration;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
+using osu.Game.Updater;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class UpdateSettings : SettingsSubsection
     {
+        [Resolved(CanBeNull = true)]
+        private UpdateManager updateManager { get; set; }
+
         protected override string Header => "Updates";
 
+        private SettingsButton checkForUpdatesButton;
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage, OsuConfigManager config, OsuGame game)
         {
@@ -23,6 +30,19 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 Bindable = config.GetBindable<ReleaseStream>(OsuSetting.ReleaseStream),
             });
 
+            if (updateManager?.CanCheckForUpdate == true)
+            {
+                Add(checkForUpdatesButton = new SettingsButton
+                {
+                    Text = "Check for updates",
+                    Action = () =>
+                    {
+                        checkForUpdatesButton.Enabled.Value = false;
+                        Task.Run(updateManager.CheckForUpdateAsync).ContinueWith(t => Schedule(() => checkForUpdatesButton.Enabled.Value = true));
+                    }
+                });
+            }
+
             if (RuntimeInfo.IsDesktop)
             {
                 Add(new SettingsButton

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -62,6 +62,7 @@ namespace osu.Game.Overlays.Toolbar
         protected ConstrainedIconContainer IconContainer;
         protected SpriteText DrawableText;
         protected Box HoverBackground;
+        private readonly Box flashBackground;
         private readonly FillFlowContainer tooltipContainer;
         private readonly SpriteText tooltip1;
         private readonly SpriteText tooltip2;
@@ -82,6 +83,13 @@ namespace osu.Game.Overlays.Toolbar
                     Blending = BlendingParameters.Additive,
                     Alpha = 0,
                 },
+                flashBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0,
+                    Colour = Color4.White.Opacity(100),
+                    Blending = BlendingParameters.Additive,
+                },
                 Flow = new FillFlowContainer
                 {
                     Direction = FillDirection.Horizontal,
@@ -139,7 +147,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            HoverBackground.FlashColour(Color4.White.Opacity(100), 500, Easing.OutQuint);
+            flashBackground.FadeOutFromOne(800, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }

osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs

@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class ToolbarHomeButton : ToolbarButton
+    public class ToolbarHomeButton : ToolbarButton, IKeyBindingHandler<GlobalAction>
     {
         public ToolbarHomeButton()
         {
@@ -13,5 +15,20 @@ namespace osu.Game.Overlays.Toolbar
             TooltipMain = "Home";
             TooltipSub = "Return to the main menu";
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (action == GlobalAction.Home)
+            {
+                Click();
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

osu.Game/Rulesets/Mods/ModTimeRamp.cs

@@ -26,6 +26,9 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The final speed to ramp to")]
         public abstract BindableNumber<double> FinalRate { get; }
 
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public abstract BindableBool AdjustPitch { get; }
+
         public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
 
         private double finalRateTime;
@@ -43,15 +46,16 @@ namespace osu.Game.Rulesets.Mods
         protected ModTimeRamp()
         {
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
-            FinalRate.BindValueChanged(val => applyAdjustment(1), true);
+            FinalRate.BindValueChanged(val => applyRateAdjustment(1), true);
+            AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
         public void ApplyToTrack(Track track)
         {
             this.track = track;
-            track.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
 
             FinalRate.TriggerChange();
+            AdjustPitch.TriggerChange();
         }
 
         public virtual void ApplyToBeatmap(IBeatmap beatmap)
@@ -66,14 +70,25 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            applyAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
         }
 
         /// <summary>
         /// Adjust the rate along the specified ramp
         /// </summary>
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
-        private void applyAdjustment(double amount) =>
+        private void applyRateAdjustment(double amount) =>
             SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+
+        private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
+        {
+            // remove existing old adjustment
+            track.RemoveAdjustment(adjustmentForPitchSetting(adjustPitchSetting.OldValue), SpeedChange);
+
+            track.AddAdjustment(adjustmentForPitchSetting(adjustPitchSetting.NewValue), SpeedChange);
+        }
+
+        private AdjustableProperty adjustmentForPitchSetting(bool adjustPitchSettingValue)
+            => adjustPitchSettingValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
     }
 }

osu.Game/Rulesets/Mods/ModWindDown.cs

@@ -37,6 +37,13 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public override BindableBool AdjustPitch { get; } = new BindableBool
+        {
+            Default = true,
+            Value = true
+        };
+
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
     }
 }

osu.Game/Rulesets/Mods/ModWindUp.cs

@@ -37,6 +37,13 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+        public override BindableBool AdjustPitch { get; } = new BindableBool
+        {
+            Default = true,
+            Value = true
+        };
+
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
     }
 }

osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs

@@ -44,6 +44,7 @@ namespace osu.Game.Rulesets.Scoring
         private double gameplayEndTime;
 
         private readonly double drainStartTime;
+        private readonly double drainLenience;
 
         private readonly List<(double time, double health)> healthIncreases = new List<(double, double)>();
         private double targetMinimumHealth;
@@ -55,9 +56,14 @@ namespace osu.Game.Rulesets.Scoring
         /// Creates a new <see cref="DrainingHealthProcessor"/>.
         /// </summary>
         /// <param name="drainStartTime">The time after which draining should begin.</param>
-        public DrainingHealthProcessor(double drainStartTime)
+        /// <param name="drainLenience">A lenience to apply to the default drain rate.<br />
+        /// A value of 0 uses the default drain rate.<br />
+        /// A value of 0.5 halves the drain rate.<br />
+        /// A value of 1 completely removes drain.</param>
+        public DrainingHealthProcessor(double drainStartTime, double drainLenience = 0)
         {
             this.drainStartTime = drainStartTime;
+            this.drainLenience = drainLenience;
         }
 
         protected override void Update()
@@ -96,6 +102,12 @@ namespace osu.Game.Rulesets.Scoring
 
             targetMinimumHealth = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, min_health_target, mid_health_target, max_health_target);
 
+            // Add back a portion of the amount of HP to be drained, depending on the lenience requested.
+            targetMinimumHealth += drainLenience * (1 - targetMinimumHealth);
+
+            // Ensure the target HP is within an acceptable range.
+            targetMinimumHealth = Math.Clamp(targetMinimumHealth, 0, 1);
+
             base.ApplyBeatmap(beatmap);
         }
 

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -11,20 +11,13 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Handlers;
@@ -63,10 +56,6 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Lazy<Playfield> playfield;
 
-        private TextureStore textureStore;
-
-        private ISampleStore localSampleStore;
-
         /// <summary>
         /// The playfield.
         /// </summary>
@@ -113,6 +102,8 @@ namespace osu.Game.Rulesets.UI
 
         private OnScreenDisplay onScreenDisplay;
 
+        private DrawableRulesetDependencies dependencies;
+
         /// <summary>
         /// Creates a ruleset visualisation for the provided ruleset and beatmap.
         /// </summary>
@@ -147,30 +138,13 @@ namespace osu.Game.Rulesets.UI
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies = new DrawableRulesetDependencies(Ruleset, base.CreateChildDependencies(parent));
 
-            var resources = Ruleset.CreateResourceStore();
+            Config = dependencies.RulesetConfigManager;
-
-            if (resources != null)
-            {
-                textureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, "Textures")));
-                textureStore.AddStore(dependencies.Get<TextureStore>());
-                dependencies.Cache(textureStore);
-
-                localSampleStore = dependencies.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, "Samples"));
-                localSampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
-                dependencies.CacheAs<ISampleStore>(new FallbackSampleStore(localSampleStore, dependencies.Get<ISampleStore>()));
-            }
 
             onScreenDisplay = dependencies.Get<OnScreenDisplay>();
-
-            Config = dependencies.Get<RulesetConfigCache>().GetConfigFor(Ruleset);
-
             if (Config != null)
-            {
-                dependencies.Cache(Config);
                 onScreenDisplay?.BeginTracking(this, Config);
-            }
 
             return dependencies;
         }
@@ -362,13 +336,14 @@ namespace osu.Game.Rulesets.UI
         {
             base.Dispose(isDisposing);
 
-            localSampleStore?.Dispose();
-
             if (Config != null)
             {
                 onScreenDisplay?.StopTracking(this, Config);
                 Config = null;
             }
+
+            // Dispose the components created by this dependency container.
+            dependencies?.Dispose();
         }
     }
 
@@ -524,62 +499,4 @@ namespace osu.Game.Rulesets.UI
         {
         }
     }
-
-    /// <summary>
-    /// A sample store which adds a fallback source.
-    /// </summary>
-    /// <remarks>
-    /// This is a temporary implementation to workaround ISampleStore limitations.
-    /// </remarks>
-    public class FallbackSampleStore : ISampleStore
-    {
-        private readonly ISampleStore primary;
-        private readonly ISampleStore secondary;
-
-        public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
-        {
-            this.primary = primary;
-            this.secondary = secondary;
-        }
-
-        public SampleChannel Get(string name) => primary.Get(name) ?? secondary.Get(name);
-
-        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? secondary.GetAsync(name);
-
-        public Stream GetStream(string name) => primary.GetStream(name) ?? secondary.GetStream(name);
-
-        public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
-
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
-
-        public BindableNumber<double> Volume => throw new NotSupportedException();
-
-        public BindableNumber<double> Balance => throw new NotSupportedException();
-
-        public BindableNumber<double> Frequency => throw new NotSupportedException();
-
-        public BindableNumber<double> Tempo => throw new NotSupportedException();
-
-        public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
-
-        public IBindable<double> AggregateVolume => throw new NotSupportedException();
-
-        public IBindable<double> AggregateBalance => throw new NotSupportedException();
-
-        public IBindable<double> AggregateFrequency => throw new NotSupportedException();
-
-        public IBindable<double> AggregateTempo => throw new NotSupportedException();
-
-        public int PlaybackConcurrency
-        {
-            get => throw new NotSupportedException();
-            set => throw new NotSupportedException();
-        }
-
-        public void Dispose()
-        {
-        }
-    }
 }

osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs

@@ -0,0 +1,148 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Game.Rulesets.Configuration;
+
+namespace osu.Game.Rulesets.UI
+{
+    public class DrawableRulesetDependencies : DependencyContainer, IDisposable
+    {
+        /// <summary>
+        /// The texture store to be used for the ruleset.
+        /// </summary>
+        public TextureStore TextureStore { get; }
+
+        /// <summary>
+        /// The sample store to be used for the ruleset.
+        /// </summary>
+        /// <remarks>
+        /// This is the local sample store pointing to the ruleset sample resources,
+        /// the cached sample store (<see cref="FallbackSampleStore"/>) retrieves from
+        /// this store and falls back to the parent store if this store doesn't have the requested sample.
+        /// </remarks>
+        public ISampleStore SampleStore { get; }
+
+        /// <summary>
+        /// The ruleset config manager.
+        /// </summary>
+        public IRulesetConfigManager RulesetConfigManager { get; private set; }
+
+        public DrawableRulesetDependencies(Ruleset ruleset, IReadOnlyDependencyContainer parent)
+            : base(parent)
+        {
+            var resources = ruleset.CreateResourceStore();
+
+            if (resources != null)
+            {
+                TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
+                TextureStore.AddStore(parent.Get<TextureStore>());
+                Cache(TextureStore);
+
+                SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
+                SampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
+                CacheAs<ISampleStore>(new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
+            }
+
+            RulesetConfigManager = parent.Get<RulesetConfigCache>().GetConfigFor(ruleset);
+            if (RulesetConfigManager != null)
+                Cache(RulesetConfigManager);
+        }
+
+        #region Disposal
+
+        ~DrawableRulesetDependencies()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private bool isDisposed;
+
+        protected void Dispose(bool disposing)
+        {
+            if (isDisposed)
+                return;
+
+            isDisposed = true;
+
+            SampleStore?.Dispose();
+            RulesetConfigManager = null;
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// A sample store which adds a fallback source.
+    /// </summary>
+    /// <remarks>
+    /// This is a temporary implementation to workaround ISampleStore limitations.
+    /// </remarks>
+    public class FallbackSampleStore : ISampleStore
+    {
+        private readonly ISampleStore primary;
+        private readonly ISampleStore secondary;
+
+        public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
+        {
+            this.primary = primary;
+            this.secondary = secondary;
+        }
+
+        public SampleChannel Get(string name) => primary.Get(name) ?? secondary.Get(name);
+
+        public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? secondary.GetAsync(name);
+
+        public Stream GetStream(string name) => primary.GetStream(name) ?? secondary.GetStream(name);
+
+        public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+
+        public BindableNumber<double> Volume => throw new NotSupportedException();
+
+        public BindableNumber<double> Balance => throw new NotSupportedException();
+
+        public BindableNumber<double> Frequency => throw new NotSupportedException();
+
+        public BindableNumber<double> Tempo => throw new NotSupportedException();
+
+        public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
+
+        public IBindable<double> AggregateVolume => throw new NotSupportedException();
+
+        public IBindable<double> AggregateBalance => throw new NotSupportedException();
+
+        public IBindable<double> AggregateFrequency => throw new NotSupportedException();
+
+        public IBindable<double> AggregateTempo => throw new NotSupportedException();
+
+        public int PlaybackConcurrency
+        {
+            get => throw new NotSupportedException();
+            set => throw new NotSupportedException();
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}

osu.Game/Scoring/LegacyDatabasedScore.cs

@@ -16,7 +16,10 @@ namespace osu.Game.Scoring
         {
             ScoreInfo = score;
 
-            var replayFilename = score.Files.First(f => f.Filename.EndsWith(".osr", StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
+            var replayFilename = score.Files.FirstOrDefault(f => f.Filename.EndsWith(".osr", StringComparison.InvariantCultureIgnoreCase))?.FileInfo.StoragePath;
+
+            if (replayFilename == null)
+                return;
 
             using (var stream = store.GetStream(replayFilename))
                 Replay = new DatabasedLegacyScoreDecoder(rulesets, beatmaps).Parse(stream).Replay;

osu.Game/Scoring/ScoreStore.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Scoring
         protected override IQueryable<ScoreInfo> AddIncludesForConsumption(IQueryable<ScoreInfo> query)
             => base.AddIncludesForConsumption(query)
                    .Include(s => s.Beatmap)
+                   .Include(s => s.Beatmap).ThenInclude(b => b.Metadata)
+                   .Include(s => s.Beatmap).ThenInclude(b => b.BeatmapSet).ThenInclude(s => s.Metadata)
                    .Include(s => s.Ruleset);
     }
 }

osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs

@@ -44,8 +44,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
-
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 

osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs

@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -26,6 +27,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly Container<PlacementBlueprint> placementBlueprintContainer;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         private InputManager inputManager;
 
         private readonly IEnumerable<DrawableHitObject> drawableHitObjects;

osu.Game/Screens/Play/GameplayClockContainer.cs

@@ -251,8 +251,9 @@ namespace osu.Game.Screens.Play
 
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
         {
-            // we always want to apply the same real-time offset, so it should be adjusted by the playback rate to achieve this.
+            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
-            public override double CurrentTime => SourceTime + Offset * Rate;
+            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
+            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
 
             public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
                 : base(source, processSource)

osu.Game/Screens/Play/Player.cs

@@ -125,6 +125,8 @@ namespace osu.Game.Screens.Play
 
         private GameplayBeatmap gameplayBeatmap;
 
+        private ScreenSuspensionHandler screenSuspension;
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -179,6 +181,7 @@ namespace osu.Game.Screens.Play
             InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
             AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
+            AddInternal(screenSuspension = new ScreenSuspensionHandler(GameplayClockContainer));
 
             dependencies.CacheAs(gameplayBeatmap);
 
@@ -628,12 +631,16 @@ namespace osu.Game.Screens.Play
 
         public override void OnSuspending(IScreen next)
         {
+            screenSuspension?.Expire();
+
             fadeOut();
             base.OnSuspending(next);
         }
 
         public override bool OnExiting(IScreen next)
         {
+            screenSuspension?.Expire();
+
             if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
                 // proceed to result screen if beatmap already finished playing

osu.Game/Screens/Play/ReplayPlayerLoader.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Play
 {
     public class ReplayPlayerLoader : PlayerLoader
     {
-        private readonly ScoreInfo scoreInfo;
+        public readonly ScoreInfo Score;
 
         public ReplayPlayerLoader(Score score)
             : base(() => new ReplayPlayer(score))
@@ -17,14 +17,14 @@ namespace osu.Game.Screens.Play
             if (score.Replay == null)
                 throw new ArgumentException($"{nameof(score)} must have a non-null {nameof(score.Replay)}.", nameof(score));
 
-            scoreInfo = score.ScoreInfo;
+            Score = score.ScoreInfo;
         }
 
         public override void OnEntering(IScreen last)
         {
             // these will be reverted thanks to PlayerLoader's lease.
-            Mods.Value = scoreInfo.Mods;
+            Mods.Value = Score.Mods;
-            Ruleset.Value = scoreInfo.Ruleset;
+            Ruleset.Value = Score.Ruleset;
 
             base.OnEntering(last);
         }

osu.Game/Screens/Play/ScreenSuspensionHandler.cs

@@ -0,0 +1,52 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// Ensures screen is not suspended / dimmed while gameplay is active.
+    /// </summary>
+    public class ScreenSuspensionHandler : Component
+    {
+        private readonly GameplayClockContainer gameplayClockContainer;
+        private Bindable<bool> isPaused;
+
+        [Resolved]
+        private GameHost host { get; set; }
+
+        public ScreenSuspensionHandler([NotNull] GameplayClockContainer gameplayClockContainer)
+        {
+            this.gameplayClockContainer = gameplayClockContainer ?? throw new ArgumentNullException(nameof(gameplayClockContainer));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // This is the only usage game-wide of suspension changes.
+            // Assert to ensure we don't accidentally forget this in the future.
+            Debug.Assert(host.AllowScreenSuspension.Value);
+
+            isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
+            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            isPaused?.UnbindAll();
+
+            if (host != null)
+                host.AllowScreenSuspension.Value = true;
+        }
+    }
+}

osu.Game/Screens/Ranking/ReplayDownloadButton.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Ranking
                 switch (State.Value)
                 {
                     case DownloadState.LocallyAvailable:
-                        game?.PresentScore(Model.Value);
+                        game?.PresentScore(Model.Value, ScorePresentType.Gameplay);
                         break;
 
                     case DownloadState.NotDownloaded:

osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs

@@ -43,6 +43,12 @@ namespace osu.Game.Skinning
         MinimumColumnWidth,
         LeftStageImage,
         RightStageImage,
-        BottomStageImage
+        BottomStageImage,
+        Hit300g,
+        Hit300,
+        Hit200,
+        Hit100,
+        Hit50,
+        Hit0,
     }
 }

osu.Game/Skinning/LegacyManiaSkinDecoder.cs

@@ -111,11 +111,10 @@ namespace osu.Game.Skinning
                         HandleColours(currentConfig, line);
                         break;
 
+                    // Custom sprite paths
                     case string _ when pair.Key.StartsWith("NoteImage"):
-                        currentConfig.ImageLookups[pair.Key] = pair.Value;
-                        break;
-
                     case string _ when pair.Key.StartsWith("KeyImage"):
+                    case string _ when pair.Key.StartsWith("Hit"):
                         currentConfig.ImageLookups[pair.Key] = pair.Value;
                         break;
                 }

osu.Game/Skinning/LegacySkin.cs

@@ -257,6 +257,14 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.RightLineWidth:
                     Debug.Assert(maniaLookup.TargetColumn != null);
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
+
+                case LegacyManiaSkinConfigurationLookups.Hit0:
+                case LegacyManiaSkinConfigurationLookups.Hit50:
+                case LegacyManiaSkinConfigurationLookups.Hit100:
+                case LegacyManiaSkinConfigurationLookups.Hit200:
+                case LegacyManiaSkinConfigurationLookups.Hit300:
+                case LegacyManiaSkinConfigurationLookups.Hit300g:
+                    return SkinUtils.As<TValue>(getManiaImage(existing, maniaLookup.Lookup.ToString()));
             }
 
             return null;

osu.Game/Skinning/LegacySkinTransformer.cs

@@ -0,0 +1,35 @@
+// 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.
+
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Transformer used to handle support of legacy features for individual rulesets.
+    /// </summary>
+    public abstract class LegacySkinTransformer : ISkin
+    {
+        /// <summary>
+        /// Source of the <see cref="ISkin"/> which is being transformed.
+        /// </summary>
+        protected ISkinSource Source { get; }
+
+        protected LegacySkinTransformer(ISkinSource source)
+        {
+            Source = source;
+        }
+
+        public abstract Drawable GetDrawableComponent(ISkinComponent component);
+
+        public Texture GetTexture(string componentName) => Source.GetTexture(componentName);
+
+        public virtual SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(sampleInfo);
+
+        public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+    }
+}