From b77e6f92b741a20adfd539d8fdbaf183fcbe8d13 Mon Sep 17 00:00:00 2001
From: StanR <hi@stanr.info>
Date: Wed, 19 Jan 2022 22:31:11 +0300
Subject: [PATCH 001/709] Fix touch device difficulty reduction not affecting
 star rating

---
 .../Difficulty/OsuDifficultyCalculator.cs                  | 4 ++++
 .../Difficulty/OsuPerformanceCalculator.cs                 | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index c5b1baaad1..537d63356b 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
 
+            if (mods.Any(m => m is OsuModTouchDevice))
+                aimRating = Math.Pow(aimRating, 0.8);
+
             if (mods.Any(h => h is OsuModRelax))
                 speedRating = 0.0;
 
@@ -120,6 +123,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
+            new OsuModTouchDevice(),
             new OsuModDoubleTime(),
             new OsuModHalfTime(),
             new OsuModEasy(),
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 604ab73454..07be3571f6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -84,12 +84,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         private double computeAimValue()
         {
-            double rawAim = Attributes.AimDifficulty;
-
-            if (mods.Any(m => m is OsuModTouchDevice))
-                rawAim = Math.Pow(rawAim, 0.8);
-
-            double aimValue = Math.Pow(5.0 * Math.Max(1.0, rawAim / 0.0675) - 4.0, 3.0) / 100000.0;
+            double aimValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.AimDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
 
             double lengthBonus = 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
                                  (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);

From d6b9f385c17e3cc78ee19962a5cfed2db7fff6d7 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 27 Nov 2021 23:58:08 -0800
Subject: [PATCH 002/709] Add failing play button by touch input test

---
 .../Visual/Beatmaps/TestSceneBeatmapCard.cs   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
index 6cb171974a..959e118fac 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCard.cs
@@ -13,12 +13,14 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps.Drawables.Cards;
+using osu.Game.Beatmaps.Drawables.Cards.Buttons;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Beatmaps
 {
@@ -293,5 +295,22 @@ namespace osu.Game.Tests.Visual.Beatmaps
 
             BeatmapCardNormal firstCard() => this.ChildrenOfType<BeatmapCardNormal>().First();
         }
+
+        [Test]
+        public void TestPlayButtonByTouchInput()
+        {
+            AddStep("create cards", () => Child = createContent(OverlayColourScheme.Blue, beatmapSetInfo => new BeatmapCardNormal(beatmapSetInfo)));
+
+            // mimics touch input
+            AddStep("touch play button area on first card", () =>
+            {
+                InputManager.MoveMouseTo(firstCard().ChildrenOfType<PlayButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("first card is playing", () => firstCard().ChildrenOfType<PlayButton>().Single().Playing.Value);
+
+            BeatmapCardNormal firstCard() => this.ChildrenOfType<BeatmapCardNormal>().First();
+        }
     }
 }

From 1107e267e3fd4f181c6bff925eaf1ed564d0dd1c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 10 Jun 2022 14:04:03 -0700
Subject: [PATCH 003/709] Fix beatmap card play button not working with touch
 inputs when not hovered

---
 osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs b/osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs
index f7bab26666..51e690d156 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Buttons/PlayButton.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
 
             Anchor = Origin = Anchor.Centre;
 
+            // needed for touch input to work when card is not hovered/expanded
+            AlwaysPresent = true;
+
             Children = new Drawable[]
             {
                 icon = new SpriteIcon

From c6ac60c0b5d5c88cb5d7fa611858507fa7f3c734 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 19 Jun 2022 13:07:10 +0200
Subject: [PATCH 004/709] Enhance target angle calculation

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs    | 48 +++++++++++++++----
 .../Utils/OsuHitObjectGenerationUtils.cs      | 33 +++++++++++++
 2 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 4f83154728..475d5a2a67 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -37,23 +37,51 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             var positionInfos = OsuHitObjectGenerationUtils.GeneratePositionInfos(osuBeatmap.HitObjects);
 
-            float rateOfChangeMultiplier = 0;
+            float sequenceOffset = 0;
+            bool flowDirection = false;
 
-            foreach (var positionInfo in positionInfos)
+            for (int i = 0; i < positionInfos.Count; i++)
             {
-                // rateOfChangeMultiplier only changes every 5 iterations in a combo
-                // to prevent shaky-line-shaped streams
-                if (positionInfo.HitObject.IndexInCurrentCombo % 5 == 0)
-                    rateOfChangeMultiplier = (float)rng.NextDouble() * 2 - 1;
+                bool invertFlow = false;
 
-                if (positionInfo == positionInfos.First())
+                if (i == 0 ||
+                    (positionInfos[i - 1].HitObject.NewCombo && (i <= 1 || !positionInfos[i - 2].HitObject.NewCombo) && (i <= 2 || !positionInfos[i - 3].HitObject.NewCombo)) ||
+                    OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
+                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.25))
                 {
-                    positionInfo.DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
-                    positionInfo.RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
+                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.02f);
+
+                    if (rng.NextDouble() < 0.6)
+                        invertFlow = true;
+                }
+
+                if (i == 0)
+                {
+                    positionInfos[i].DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
+                    positionInfos[i].RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
                 }
                 else
                 {
-                    positionInfo.RelativeAngle = rateOfChangeMultiplier * 2 * (float)Math.PI * Math.Min(1f, positionInfo.DistanceFromPrevious / (playfield_diagonal * 0.5f));
+                    float flowChangeOffset = 0;
+                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.03f);
+
+                    if (positionInfos[i - 1].HitObject.NewCombo && (i <= 1 || !positionInfos[i - 2].HitObject.NewCombo) && rng.NextDouble() < 0.6)
+                    {
+                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.05f);
+
+                        if (rng.NextDouble() < 0.8)
+                            invertFlow = true;
+                    }
+
+                    if (invertFlow)
+                        flowDirection ^= true;
+
+                    positionInfos[i].RelativeAngle = OsuHitObjectGenerationUtils.GetRelativeTargetAngle(
+                        positionInfos[i].DistanceFromPrevious,
+                        (sequenceOffset + oneTimeOffset) * (float)Math.Sqrt(positionInfos[i].DistanceFromPrevious) +
+                        flowChangeOffset * (float)Math.Sqrt(640 - positionInfos[i].DistanceFromPrevious),
+                        flowDirection
+                    );
                 }
             }
 
diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index 5e827d4782..9044fe142b 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 
@@ -186,5 +187,37 @@ namespace osu.Game.Rulesets.Osu.Utils
                 length * MathF.Sin(angle)
             );
         }
+
+        public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
+        {
+            var timingPoints = beatmap.ControlPointInfo.TimingPoints;
+            var currentTimingPoint = timingPoints.Reverse().FirstOrDefault(p => p.Time <= hitObject.StartTime);
+
+            if (currentTimingPoint == null)
+                return false;
+
+            double timeSinceTimingPoint = hitObject.StartTime - currentTimingPoint.Time;
+
+            double length = downbeatsOnly
+                ? currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator
+                : currentTimingPoint.BeatLength;
+
+            return (timeSinceTimingPoint + 1) % length < 2;
+        }
+
+        public static float GetRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
+        {
+            float angle = (float)(3.3 / (1 + 200 * Math.Pow(MathHelper.E, 0.016 * (targetDistance - 466))) + 0.45 + offset);
+            float relativeAngle = MathHelper.Pi - angle;
+            return flowDirection ? -relativeAngle : relativeAngle;
+        }
+
+        public static float RandomGaussian(Random rng, float mean = 0, float stdDev = 1)
+        {
+            double x1 = 1 - rng.NextDouble();
+            double x2 = 1 - rng.NextDouble();
+            double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(MathHelper.TwoPi * x2);
+            return mean + stdDev * (float)stdNormal;
+        }
     }
 }

From 33c6c6af6b2995f4717009a2cc646775e32d419b Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 19 Jun 2022 13:50:09 +0200
Subject: [PATCH 005/709] Adjust target angle calculation parameters

---
 osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index 9044fe142b..b9c384f842 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Utils
 
         public static float GetRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            float angle = (float)(3.3 / (1 + 200 * Math.Pow(MathHelper.E, 0.016 * (targetDistance - 466))) + 0.45 + offset);
+            float angle = (float)(3 / (1 + 200 * Math.Pow(MathHelper.E, 0.016 * (targetDistance - 466))) + 0.45 + offset);
             float relativeAngle = MathHelper.Pi - angle;
             return flowDirection ? -relativeAngle : relativeAngle;
         }

From 7317b9b90960a2b326ec858e61b668375fa7e0ac Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 19 Jun 2022 14:59:28 +0200
Subject: [PATCH 006/709] Remove unused field

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 475d5a2a67..2560ed921d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTarget)).ToArray();
 
-        private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
-
         private Random? rng;
 
         public void ApplyToBeatmap(IBeatmap beatmap)

From 9090e7502075ed9731f75408b43f5d9afe35646d Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 19 Jun 2022 20:43:17 +0200
Subject: [PATCH 007/709] Add XML documentation

---
 .../Utils/OsuHitObjectGenerationUtils.cs                  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index b9c384f842..f503956aee 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -188,6 +188,11 @@ namespace osu.Game.Rulesets.Osu.Utils
             );
         }
 
+        /// <param name="beatmap">The beatmap hitObject is a part of.</param>
+        /// <param name="hitObject">The <see cref="OsuHitObject"/> that should be checked.</param>
+        /// <param name="downbeatsOnly">If true, this method only returns true if hitObject is on a downbeat.
+        /// If false, it returns true if hitObject is on any beat.</param>
+        /// <returns>true if hitObject is on a (down-)beat, false otherwise.</returns>
         public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
         {
             var timingPoints = beatmap.ControlPointInfo.TimingPoints;
@@ -205,6 +210,9 @@ namespace osu.Game.Rulesets.Osu.Utils
             return (timeSinceTimingPoint + 1) % length < 2;
         }
 
+        /// <param name="targetDistance">The target distance between the previous and the current <see cref="OsuHitObject"/>.</param>
+        /// <param name="offset">The angle (in rad) by which the target angle should be offset.</param>
+        /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
         public static float GetRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
             float angle = (float)(3 / (1 + 200 * Math.Pow(MathHelper.E, 0.016 * (targetDistance - 466))) + 0.45 + offset);

From 1bb27cd4880f4dd4766d1cace022c37e0f23585b Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 19 Jun 2022 23:03:41 +0200
Subject: [PATCH 008/709] Code optimisation

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs    | 23 +++++++++++++++----
 .../Utils/OsuHitObjectGenerationUtils.cs      | 18 ++++-----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 2560ed921d..55151ae2c1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Osu.Utils;
 
@@ -22,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTarget)).ToArray();
 
+        private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
+
         private Random? rng;
 
         public void ApplyToBeatmap(IBeatmap beatmap)
@@ -43,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 bool invertFlow = false;
 
                 if (i == 0 ||
-                    (positionInfos[i - 1].HitObject.NewCombo && (i <= 1 || !positionInfos[i - 2].HitObject.NewCombo) && (i <= 2 || !positionInfos[i - 3].HitObject.NewCombo)) ||
+                    (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6) ||
                     OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
                     (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.25))
                 {
@@ -63,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     float flowChangeOffset = 0;
                     float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.03f);
 
-                    if (positionInfos[i - 1].HitObject.NewCombo && (i <= 1 || !positionInfos[i - 2].HitObject.NewCombo) && rng.NextDouble() < 0.6)
+                    if (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6)
                     {
                         flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.05f);
 
@@ -72,12 +75,12 @@ namespace osu.Game.Rulesets.Osu.Mods
                     }
 
                     if (invertFlow)
-                        flowDirection ^= true;
+                        flowDirection = !flowDirection;
 
-                    positionInfos[i].RelativeAngle = OsuHitObjectGenerationUtils.GetRelativeTargetAngle(
+                    positionInfos[i].RelativeAngle = getRelativeTargetAngle(
                         positionInfos[i].DistanceFromPrevious,
                         (sequenceOffset + oneTimeOffset) * (float)Math.Sqrt(positionInfos[i].DistanceFromPrevious) +
-                        flowChangeOffset * (float)Math.Sqrt(640 - positionInfos[i].DistanceFromPrevious),
+                        flowChangeOffset * (float)Math.Sqrt(playfield_diagonal - positionInfos[i].DistanceFromPrevious),
                         flowDirection
                     );
                 }
@@ -85,5 +88,15 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             osuBeatmap.HitObjects = OsuHitObjectGenerationUtils.RepositionHitObjects(positionInfos);
         }
+
+        /// <param name="targetDistance">The target distance between the previous and the current <see cref="OsuHitObject"/>.</param>
+        /// <param name="offset">The angle (in rad) by which the target angle should be offset.</param>
+        /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
+        private static float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
+        {
+            float angle = (float)(3 / (1 + 200 * Math.Exp(0.016 * (targetDistance - 466))) + 0.45 + offset);
+            float relativeAngle = (float)Math.PI - angle;
+            return flowDirection ? -relativeAngle : relativeAngle;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index f503956aee..117d6f3a80 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Utils
         public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
         {
             var timingPoints = beatmap.ControlPointInfo.TimingPoints;
-            var currentTimingPoint = timingPoints.Reverse().FirstOrDefault(p => p.Time <= hitObject.StartTime);
+            var currentTimingPoint = timingPoints.LastOrDefault(p => p.Time <= hitObject.StartTime);
 
             if (currentTimingPoint == null)
                 return false;
@@ -210,21 +210,11 @@ namespace osu.Game.Rulesets.Osu.Utils
             return (timeSinceTimingPoint + 1) % length < 2;
         }
 
-        /// <param name="targetDistance">The target distance between the previous and the current <see cref="OsuHitObject"/>.</param>
-        /// <param name="offset">The angle (in rad) by which the target angle should be offset.</param>
-        /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
-        public static float GetRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
-        {
-            float angle = (float)(3 / (1 + 200 * Math.Pow(MathHelper.E, 0.016 * (targetDistance - 466))) + 0.45 + offset);
-            float relativeAngle = MathHelper.Pi - angle;
-            return flowDirection ? -relativeAngle : relativeAngle;
-        }
-
         public static float RandomGaussian(Random rng, float mean = 0, float stdDev = 1)
         {
-            double x1 = 1 - rng.NextDouble();
-            double x2 = 1 - rng.NextDouble();
-            double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(MathHelper.TwoPi * x2);
+            double x1 = rng.NextDouble();
+            double x2 = rng.NextDouble();
+            double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(2 * Math.PI * x2);
             return mean + stdDev * (float)stdNormal;
         }
     }

From 3356742ba2d5b74372c6641a4d857cf6138ad44f Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 20 Jun 2022 00:05:03 +0200
Subject: [PATCH 009/709] Adjust angle offset caluclations

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 55151ae2c1..ef3eaf2a9d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
                     (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.25))
                 {
-                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.02f);
+                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0015f);
 
                     if (rng.NextDouble() < 0.6)
                         invertFlow = true;
@@ -64,11 +64,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                 else
                 {
                     float flowChangeOffset = 0;
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.03f);
+                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0015f);
 
                     if (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6)
                     {
-                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.05f);
+                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
 
                         if (rng.NextDouble() < 0.8)
                             invertFlow = true;
@@ -79,8 +79,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                     positionInfos[i].RelativeAngle = getRelativeTargetAngle(
                         positionInfos[i].DistanceFromPrevious,
-                        (sequenceOffset + oneTimeOffset) * (float)Math.Sqrt(positionInfos[i].DistanceFromPrevious) +
-                        flowChangeOffset * (float)Math.Sqrt(playfield_diagonal - positionInfos[i].DistanceFromPrevious),
+                        (sequenceOffset + oneTimeOffset) * positionInfos[i].DistanceFromPrevious +
+                        flowChangeOffset * (playfield_diagonal - positionInfos[i].DistanceFromPrevious),
                         flowDirection
                     );
                 }

From a912bcadf82aa7eb4e885cf81da35e980824dd55 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 20 Jun 2022 00:19:29 +0200
Subject: [PATCH 010/709] Fix possible exception caused by `log(0)`

---
 osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index 117d6f3a80..ce7f39cdf8 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -212,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Utils
 
         public static float RandomGaussian(Random rng, float mean = 0, float stdDev = 1)
         {
-            double x1 = rng.NextDouble();
-            double x2 = rng.NextDouble();
+            double x1 = 1 - rng.NextDouble();
+            double x2 = 1 - rng.NextDouble();
             double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(2 * Math.PI * x2);
             return mean + stdDev * (float)stdNormal;
         }

From 2f1186d3284b8cad32d7c6ae83a50bc72d00b326 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Wed, 22 Jun 2022 16:49:07 +0200
Subject: [PATCH 011/709] Add comments and XML doc

---
 osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index ce7f39cdf8..a890dbde43 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -210,10 +210,16 @@ namespace osu.Game.Rulesets.Osu.Utils
             return (timeSinceTimingPoint + 1) % length < 2;
         }
 
+        /// <summary>
+        /// Generates a random number from a normal distribution using the Box-Muller transform.
+        /// </summary>
         public static float RandomGaussian(Random rng, float mean = 0, float stdDev = 1)
         {
+            // Generate 2 random numbers in the interval (0,1].
+            // x1 must not be 0 since log(0) = undefined.
             double x1 = 1 - rng.NextDouble();
             double x2 = 1 - rng.NextDouble();
+
             double stdNormal = Math.Sqrt(-2 * Math.Log(x1)) * Math.Sin(2 * Math.PI * x2);
             return mean + stdDev * (float)stdNormal;
         }

From 855debd5f66c2c1a4cd25d63bfd61d0dc477fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 09:29:17 +0800
Subject: [PATCH 012/709] Remove nullable disable annotation and mark some
 return value as nullable.

---
 osu.Game/Rulesets/Ruleset.cs | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index c1ec6c30ef..7130f4bc35 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -81,7 +79,7 @@ namespace osu.Game.Rulesets
         /// Returns a fresh instance of the mod matching the specified acronym.
         /// </summary>
         /// <param name="acronym">The acronym to query for .</param>
-        public Mod CreateModFromAcronym(string acronym)
+        public Mod? CreateModFromAcronym(string acronym)
         {
             return AllMods.FirstOrDefault(m => m.Acronym == acronym)?.CreateInstance();
         }
@@ -89,7 +87,7 @@ namespace osu.Game.Rulesets
         /// <summary>
         /// Returns a fresh instance of the mod matching the specified type.
         /// </summary>
-        public T CreateMod<T>()
+        public T? CreateMod<T>()
             where T : Mod
         {
             return AllMods.FirstOrDefault(m => m is T)?.CreateInstance() as T;
@@ -183,10 +181,9 @@ namespace osu.Game.Rulesets
             return value;
         }
 
-        [CanBeNull]
-        public ModAutoplay GetAutoplayMod() => CreateMod<ModAutoplay>();
+        public ModAutoplay? GetAutoplayMod() => CreateMod<ModAutoplay>();
 
-        public virtual ISkin CreateLegacySkinProvider([NotNull] ISkin skin, IBeatmap beatmap) => null;
+        public virtual ISkin? CreateLegacySkinProvider([NotNull] ISkin skin, IBeatmap beatmap) => null;
 
         protected Ruleset()
         {
@@ -206,7 +203,7 @@ namespace osu.Game.Rulesets
         /// <param name="beatmap">The beatmap to create the hit renderer for.</param>
         /// <param name="mods">The <see cref="Mod"/>s to apply.</param>
         /// <exception cref="BeatmapInvalidForRulesetException">Unable to successfully load the beatmap to be usable with this ruleset.</exception>
-        public abstract DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
+        public abstract DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null);
 
         /// <summary>
         /// Creates a <see cref="ScoreProcessor"/> for this <see cref="Ruleset"/>.
@@ -240,8 +237,7 @@ namespace osu.Game.Rulesets
         /// Optionally creates a <see cref="PerformanceCalculator"/> to generate performance data from the provided score.
         /// </summary>
         /// <returns>A performance calculator instance for the provided score.</returns>
-        [CanBeNull]
-        public virtual PerformanceCalculator CreatePerformanceCalculator() => null;
+        public virtual PerformanceCalculator? CreatePerformanceCalculator() => null;
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
@@ -253,7 +249,7 @@ namespace osu.Game.Rulesets
 
         public abstract string Description { get; }
 
-        public virtual RulesetSettingsSubsection CreateSettings() => null;
+        public virtual RulesetSettingsSubsection? CreateSettings() => null;
 
         /// <summary>
         /// Creates the <see cref="IRulesetConfigManager"/> for this <see cref="Ruleset"/>.
@@ -303,7 +299,6 @@ namespace osu.Game.Rulesets
         /// <param name="score">The <see cref="ScoreInfo"/> to create the statistics for. The score is guaranteed to have <see cref="ScoreInfo.HitEvents"/> populated.</param>
         /// <param name="playableBeatmap">The <see cref="IBeatmap"/>, converted for this <see cref="Ruleset"/> with all relevant <see cref="Mod"/>s applied.</param>
         /// <returns>The <see cref="StatisticRow"/>s to display. Each <see cref="StatisticRow"/> may contain 0 or more <see cref="StatisticItem"/>.</returns>
-        [NotNull]
         public virtual StatisticRow[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => Array.Empty<StatisticRow>();
 
         /// <summary>
@@ -356,13 +351,11 @@ namespace osu.Game.Rulesets
         /// <summary>
         /// Creates ruleset-specific beatmap filter criteria to be used on the song select screen.
         /// </summary>
-        [CanBeNull]
-        public virtual IRulesetFilterCriteria CreateRulesetFilterCriteria() => null;
+        public virtual IRulesetFilterCriteria? CreateRulesetFilterCriteria() => null;
 
         /// <summary>
         /// Can be overridden to add a ruleset-specific section to the editor beatmap setup screen.
         /// </summary>
-        [CanBeNull]
-        public virtual RulesetSetupSection CreateEditorSetupSection() => null;
+        public virtual RulesetSetupSection? CreateEditorSetupSection() => null;
     }
 }

From 4a503bab0a3d520965efeb54594053baaacc348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 09:29:59 +0800
Subject: [PATCH 013/709] Remove unnecessary attribute.

---
 osu.Game/Rulesets/Ruleset.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 7130f4bc35..af8ff10fa1 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
-using JetBrains.Annotations;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
@@ -101,7 +100,6 @@ namespace osu.Game.Rulesets
         /// then the proper behaviour is to return an empty enumerable.
         /// <see langword="null"/> mods should not be present in the returned enumerable.
         /// </remarks>
-        [ItemNotNull]
         public abstract IEnumerable<Mod> GetModsFor(ModType type);
 
         /// <summary>
@@ -183,7 +181,7 @@ namespace osu.Game.Rulesets
 
         public ModAutoplay? GetAutoplayMod() => CreateMod<ModAutoplay>();
 
-        public virtual ISkin? CreateLegacySkinProvider([NotNull] ISkin skin, IBeatmap beatmap) => null;
+        public virtual ISkin? CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => null;
 
         protected Ruleset()
         {

From e67cb4c90520e4c328c653372bd11b20a67a9935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 09:35:46 +0800
Subject: [PATCH 014/709] Mark create beatmap verifier as nullable because
 seems it's not requirement to be implemented.

---
 osu.Game/Rulesets/Ruleset.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index af8ff10fa1..14513b06b8 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual IBeatmapVerifier CreateBeatmapVerifier() => null;
+        public virtual IBeatmapVerifier? CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 

From 857377e1451402cb8848da21c9cd0d00c01dbb15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 09:53:05 +0800
Subject: [PATCH 015/709] Move CreateConvertibleReplayFrame() into legacy
 ruleset interface because technically only legacy ruleset use it to convert
 the legacy frame.

But seems some of the customized ruleset use it for save the replay frame.
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 2 +-
 osu.Game/Rulesets/ILegacyRuleset.cs           | 9 ++++++++-
 osu.Game/Rulesets/Ruleset.cs                  | 8 --------
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 2 +-
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 6 +++++-
 8 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f832d99807..766b5f6f58 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -187,7 +187,7 @@ namespace osu.Game.Rulesets.Catch
 
         public int LegacyID => 2;
 
-        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
+        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
 
         public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4723416c30..f45a2517df 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Rulesets.Mania
 
         public int LegacyID => 3;
 
-        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
+        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 120ce32612..392574ef03 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -234,7 +234,7 @@ namespace osu.Game.Rulesets.Osu
 
         public int LegacyID => 0;
 
-        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
+        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 223e268d7f..66fc64c018 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public int LegacyID => 1;
 
-        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
+        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
         protected override IEnumerable<HitResult> GetValidHitResults()
         {
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index a8cfed4866..c2617a065c 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -1,7 +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.
 
-#nullable disable
+using osu.Game.Rulesets.Replays.Types;
 
 namespace osu.Game.Rulesets
 {
@@ -13,5 +13,12 @@ namespace osu.Game.Rulesets
         /// Identifies the server-side ID of a legacy ruleset.
         /// </summary>
         int LegacyID { get; }
+
+        /// <summary>
+        /// For rulesets which support legacy (osu-stable) replay conversion, this method will create an empty replay frame
+        /// for conversion use.
+        /// </summary>
+        /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
+        IConvertibleReplayFrame CreateConvertibleReplayFrame();
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 14513b06b8..89ef6d2d54 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -13,7 +13,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.UI;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Configuration;
@@ -284,13 +283,6 @@ namespace osu.Game.Rulesets
         /// <returns>A descriptive name of the variant.</returns>
         public virtual string GetVariantName(int variant) => string.Empty;
 
-        /// <summary>
-        /// For rulesets which support legacy (osu-stable) replay conversion, this method will create an empty replay frame
-        /// for conversion use.
-        /// </summary>
-        /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
-        public virtual IConvertibleReplayFrame CreateConvertibleReplayFrame() => null;
-
         /// <summary>
         /// Creates the statistics for a <see cref="ScoreInfo"/> to be displayed in the results screen.
         /// </summary>
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index f64e730c06..2b22b4abc7 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -282,7 +282,7 @@ namespace osu.Game.Scoring.Legacy
 
         private ReplayFrame convertFrame(LegacyReplayFrame currentFrame, ReplayFrame lastFrame)
         {
-            var convertible = currentRuleset.CreateConvertibleReplayFrame();
+            var convertible = (currentRuleset as ILegacyRuleset)?.CreateConvertibleReplayFrame();
             if (convertible == null)
                 throw new InvalidOperationException($"Legacy replay cannot be converted for the ruleset: {currentRuleset.Description}");
 
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 797787b194..f59fd9559c 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Spectator;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
@@ -79,11 +80,14 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
+            if (GameplayState.Ruleset is not ILegacyRuleset legacyRuleset)
+                return;
+
             bool isFirstBundle = score.Replay.Frames.Count == 0;
 
             foreach (var frame in bundle.Frames)
             {
-                IConvertibleReplayFrame convertibleFrame = GameplayState.Ruleset.CreateConvertibleReplayFrame();
+                IConvertibleReplayFrame convertibleFrame = legacyRuleset.CreateConvertibleReplayFrame();
                 convertibleFrame.FromLegacy(frame, GameplayState.Beatmap);
 
                 var convertedFrame = (ReplayFrame)convertibleFrame;

From d39f53f1f0e2ab307c593eb928078f0c55a13684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 10:01:56 +0800
Subject: [PATCH 016/709] Mark `CreateConfig()` return type as nullable because
 it's not required all ruleset to implement. Also, remove nullable disable
 annotation for all using classes.

Setting store can be nullable because `RulesetConfigManager()` can accept null setting store.
---
 osu.Game/Rulesets/Ruleset.cs                      | 2 +-
 osu.Game/Rulesets/RulesetConfigCache.cs           | 6 ++----
 osu.Game/Tests/Rulesets/TestRulesetConfigCache.cs | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 89ef6d2d54..cd3ab4f726 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets
         /// Creates the <see cref="IRulesetConfigManager"/> for this <see cref="Ruleset"/>.
         /// </summary>
         /// <param name="settings">The <see cref="SettingsStore"/> to store the settings.</param>
-        public virtual IRulesetConfigManager CreateConfig(SettingsStore settings) => null;
+        public virtual IRulesetConfigManager? CreateConfig(SettingsStore? settings) => null;
 
         /// <summary>
         /// A unique short name to reference this ruleset in online requests.
diff --git a/osu.Game/Rulesets/RulesetConfigCache.cs b/osu.Game/Rulesets/RulesetConfigCache.cs
index 017214df61..ab44e86048 100644
--- a/osu.Game/Rulesets/RulesetConfigCache.cs
+++ b/osu.Game/Rulesets/RulesetConfigCache.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
@@ -18,7 +16,7 @@ namespace osu.Game.Rulesets
         private readonly RealmAccess realm;
         private readonly RulesetStore rulesets;
 
-        private readonly Dictionary<string, IRulesetConfigManager> configCache = new Dictionary<string, IRulesetConfigManager>();
+        private readonly Dictionary<string, IRulesetConfigManager?> configCache = new Dictionary<string, IRulesetConfigManager?>();
 
         public RulesetConfigCache(RealmAccess realm, RulesetStore rulesets)
         {
@@ -42,7 +40,7 @@ namespace osu.Game.Rulesets
             }
         }
 
-        public IRulesetConfigManager GetConfigFor(Ruleset ruleset)
+        public IRulesetConfigManager? GetConfigFor(Ruleset ruleset)
         {
             if (!IsLoaded)
                 throw new InvalidOperationException($@"Cannot retrieve {nameof(IRulesetConfigManager)} before {nameof(RulesetConfigCache)} has loaded");
diff --git a/osu.Game/Tests/Rulesets/TestRulesetConfigCache.cs b/osu.Game/Tests/Rulesets/TestRulesetConfigCache.cs
index a80154c38e..cf637983d9 100644
--- a/osu.Game/Tests/Rulesets/TestRulesetConfigCache.cs
+++ b/osu.Game/Tests/Rulesets/TestRulesetConfigCache.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Collections.Concurrent;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Configuration;
@@ -14,8 +12,8 @@ namespace osu.Game.Tests.Rulesets
     /// </summary>
     public class TestRulesetConfigCache : IRulesetConfigCache
     {
-        private readonly ConcurrentDictionary<string, IRulesetConfigManager> configCache = new ConcurrentDictionary<string, IRulesetConfigManager>();
+        private readonly ConcurrentDictionary<string, IRulesetConfigManager?> configCache = new ConcurrentDictionary<string, IRulesetConfigManager?>();
 
-        public IRulesetConfigManager GetConfigFor(Ruleset ruleset) => configCache.GetOrAdd(ruleset.ShortName, _ => ruleset.CreateConfig(null));
+        public IRulesetConfigManager? GetConfigFor(Ruleset ruleset) => configCache.GetOrAdd(ruleset.ShortName, _ => ruleset.CreateConfig(null));
     }
 }

From 57c6763556920d09399fe679c1dfc8d386686759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 10:07:09 +0800
Subject: [PATCH 017/709] Mark the `CreateBeatmapProcessor()` as nullable.
 Also, should add the null check in the working beatmap.

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 11 +++++++----
 osu.Game/Rulesets/Ruleset.cs        |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 16464932e0..22c3ad43e6 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -279,12 +279,15 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            IBeatmapProcessor processor = rulesetInstance.CreateBeatmapProcessor(converted);
+            var processor = rulesetInstance.CreateBeatmapProcessor(converted);
 
-            foreach (var mod in mods.OfType<IApplicableToBeatmapProcessor>())
-                mod.ApplyToBeatmapProcessor(processor);
+            if (processor != null)
+            {
+                foreach (var mod in mods.OfType<IApplicableToBeatmapProcessor>())
+                    mod.ApplyToBeatmapProcessor(processor);
 
-            processor?.PreProcess();
+                processor.PreProcess();
+            }
 
             // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
             foreach (var obj in converted.HitObjects)
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index cd3ab4f726..bd2d147a08 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Rulesets
         /// </summary>
         /// <param name="beatmap">The <see cref="IBeatmap"/> to be processed.</param>
         /// <returns>The <see cref="IBeatmapProcessor"/>.</returns>
-        public virtual IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => null;
+        public virtual IBeatmapProcessor? CreateBeatmapProcessor(IBeatmap beatmap) => null;
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap);
 

From 8e1ed1c621d12c4b1a1f97812968043b8eb7017c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 10:09:32 +0800
Subject: [PATCH 018/709] Mark CreateHitObjectComposer() accept null. And add
 the null check in the test case.

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 8 +++++++-
 osu.Game/Rulesets/Ruleset.cs                       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 437f06c47f..7c11b4aa56 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -39,7 +39,13 @@ namespace osu.Game.Tests.Visual.Editing
             Dependencies.Cache(EditorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(EditorBeatmap);
 
-            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d => d.Alpha = 0);
+            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d =>
+            {
+                if (d == null)
+                    return;
+
+                d.Alpha = 0;
+            });
 
             Add(new OsuContextMenuContainer
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index bd2d147a08..2cab529a4b 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -236,7 +236,7 @@ namespace osu.Game.Rulesets
         /// <returns>A performance calculator instance for the provided score.</returns>
         public virtual PerformanceCalculator? CreatePerformanceCalculator() => null;
 
-        public virtual HitObjectComposer CreateHitObjectComposer() => null;
+        public virtual HitObjectComposer? CreateHitObjectComposer() => null;
 
         public virtual IBeatmapVerifier? CreateBeatmapVerifier() => null;
 

From 1725a76fa0183cd9e9c9b7a2139ee498f525a11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Sun, 10 Jul 2022 10:15:02 +0800
Subject: [PATCH 019/709] Remove the nullable disable annotation for all
 rulesets.

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs | 4 +---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs | 6 ++----
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 6 ++----
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 4 +---
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 766b5f6f58..964598dcaf 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Catch.Mods;
@@ -32,7 +30,7 @@ namespace osu.Game.Rulesets.Catch
 {
     public class CatchRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableCatchRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index f45a2517df..b391c64572 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
@@ -47,7 +45,7 @@ namespace osu.Game.Rulesets.Mania
         /// </summary>
         public const int MAX_STAGE_KEYS = 10;
 
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableManiaRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
@@ -282,7 +280,7 @@ namespace osu.Game.Rulesets.Mania
 
         public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
-        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
+        public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
 
         public override RulesetSettingsSubsection CreateSettings() => new ManiaSettingsSubsection(this);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 392574ef03..458a0a12f4 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
@@ -43,7 +41,7 @@ namespace osu.Game.Rulesets.Osu
 {
     public class OsuRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableOsuRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
 
@@ -236,7 +234,7 @@ namespace osu.Game.Rulesets.Osu
 
         public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
-        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
+        public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
         protected override IEnumerable<HitResult> GetValidHitResults()
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 66fc64c018..19aa3e1016 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
@@ -36,7 +34,7 @@ namespace osu.Game.Rulesets.Taiko
 {
     public class TaikoRuleset : Ruleset, ILegacyRuleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
 

From 3dbd0c9055dac6c32e9b8bd31baad2d6d42ac7cb Mon Sep 17 00:00:00 2001
From: andy <andy840119@gmail.com>
Date: Tue, 12 Jul 2022 09:37:16 +0800
Subject: [PATCH 020/709] Update
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 7c11b4aa56..40d91dcbaa 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -39,13 +39,10 @@ namespace osu.Game.Tests.Visual.Editing
             Dependencies.Cache(EditorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(EditorBeatmap);
 
-            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d =>
-            {
-                if (d == null)
-                    return;
+            Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer();
+            Debug.Assert(Composer != null);
 
-                d.Alpha = 0;
-            });
+            Composer.Alpha = 0;
 
             Add(new OsuContextMenuContainer
             {

From 079fcf13a6245a987e12fa7db7a06401452be51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Tue, 12 Jul 2022 09:41:03 +0800
Subject: [PATCH 021/709] Add missing import.

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 40d91dcbaa..d4c96a837b 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;

From 6a643cb6eae329fe7e434c07392f195f283890ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=82=BA=E4=BB=80=E9=BA=BC?= <andy840119@gmail.com>
Date: Tue, 12 Jul 2022 09:41:19 +0800
Subject: [PATCH 022/709] Use Debug.Assert instead.

---
 osu.Game/Screens/Play/SpectatorPlayer.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index f59fd9559c..659d7d5d6c 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
@@ -80,8 +81,8 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
-            if (GameplayState.Ruleset is not ILegacyRuleset legacyRuleset)
-                return;
+            var legacyRuleset = GameplayState.Ruleset as ILegacyRuleset;
+            Debug.Assert(legacyRuleset != null);
 
             bool isFirstBundle = score.Replay.Frames.Count == 0;
 

From a5a8fac66f6e58afd9b4984c94be0dedef7a2e4a Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Thu, 21 Jul 2022 18:24:31 +0800
Subject: [PATCH 023/709] Add multiple units support in search length criteria

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 03b72bf5e9..436beae30d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -312,11 +312,18 @@ namespace osu.Game.Screens.Select
 
         private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
         {
-            if (!tryParseDoubleWithPoint(val.TrimEnd('m', 's', 'h'), out double length))
-                return false;
-
-            int scale = getLengthScale(val);
-            return tryUpdateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
+            string[] parts = Regex.Split(val, @"(?<=[msh])").Where(x => x.Length > 0).ToArray();
+            double totalLength = 0;
+            int minScale = 1000;
+            foreach (string part in parts)
+            {
+                if (!tryParseDoubleWithPoint(part.TrimEnd('m', 's', 'h'), out double length))
+                    return false;
+                int scale = getLengthScale(part);
+                totalLength += length * scale;
+                minScale = Math.Min(minScale, scale);
+            }
+            return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
     }
 }

From 6baaef432f086209c163b52d5393d3d32ce62e7c Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Thu, 21 Jul 2022 18:49:13 +0800
Subject: [PATCH 024/709] Add colon parsing support in search length criteria

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 436beae30d..ee7a1617cd 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -312,9 +312,25 @@ namespace osu.Game.Screens.Select
 
         private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
         {
+            if (val.Contains(':'))
+            {
+                if (val.Contains('h') || val.Contains('m') || val.Contains('s'))
+                    return false;
+
+                int count = val.Count(c => c == ':');
+                if (count > 3)
+                    return false;
+
+                if (count > 2)
+                    val = val.Replace(':', 'h');
+                
+                val = val.Replace(':', 'm');
+            }
+
             string[] parts = Regex.Split(val, @"(?<=[msh])").Where(x => x.Length > 0).ToArray();
             double totalLength = 0;
             int minScale = 1000;
+
             foreach (string part in parts)
             {
                 if (!tryParseDoubleWithPoint(part.TrimEnd('m', 's', 'h'), out double length))
@@ -323,6 +339,7 @@ namespace osu.Game.Screens.Select
                 totalLength += length * scale;
                 minScale = Math.Min(minScale, scale);
             }
+
             return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
     }

From 52fad1e14d4292f0c867cb099eb1fcee1b6b960f Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Thu, 21 Jul 2022 18:59:48 +0800
Subject: [PATCH 025/709] Add test cases for search length criteria

---
 osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index bd0617515b..9f97c39462 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -125,6 +125,10 @@ namespace osu.Game.Tests.NonVisual.Filtering
             new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1) },
             new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1) },
             new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1) },
+            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
+            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
+            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
+            new object[] { "0:2:35", TimeSpan.FromSeconds(155), TimeSpan.FromSeconds(1) },
         };
 
         [Test]

From ae0902ca86e30d690459c1dedb28a9d01f0d6ff7 Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Fri, 22 Jul 2022 02:55:11 +0800
Subject: [PATCH 026/709] Fix lax in search criteria parsing

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 49 +++++++++++++-------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index ee7a1617cd..25dd342353 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -312,34 +313,50 @@ namespace osu.Game.Screens.Select
 
         private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
         {
-            if (val.Contains(':'))
+            List<string> parts = new List<string>();
+
+            if (Regex.IsMatch(val, @"^\d+(:\d+(:\d+)?)?$")) // formats like 12:34
             {
-                if (val.Contains('h') || val.Contains('m') || val.Contains('s'))
+                string[] splited = val.Split(':');
+                for (int i = splited.Length - 1; i >= 0; i--)
+                    parts.Add(splited[i] + "smh"[splited.Length - i - 1]);
+            }
+            else if (Regex.IsMatch(val, @"^(\d+(\.\d+)?[hms]){1,3}$")) // formats like 1h2m3s
+            {
+                if (!"hms".Contains(Regex.Replace(val, @"[\d\.]", "")))
                     return false;
 
-                int count = val.Count(c => c == ':');
-                if (count > 3)
-                    return false;
-
-                if (count > 2)
-                    val = val.Replace(':', 'h');
-                
-                val = val.Replace(':', 'm');
+                string[] splited = Regex.Split(val, @"(?<=[hms])").Where(x => x.Length > 0).ToArray();
+                for (int i = splited.Length - 1; i >= 0; i--)
+                    parts.Add(splited[i]);
+            }
+            else if (Regex.IsMatch(val, @"^\d+(\.\d+)?$")) // only one number
+            {
+                parts.Add(val + 's');
             }
 
-            string[] parts = Regex.Split(val, @"(?<=[msh])").Where(x => x.Length > 0).ToArray();
-            double totalLength = 0;
-            int minScale = 1000;
+            if (parts.Count == 0)
+                return false;
 
-            foreach (string part in parts)
+            double totalLength = 0;
+            int minScale = 3600000;
+
+            for (int i = 0; i < parts.Count; i++)
             {
-                if (!tryParseDoubleWithPoint(part.TrimEnd('m', 's', 'h'), out double length))
+                string part = parts[i];
+                string partNoUnit = part.TrimEnd('m', 's', 'h');
+                if (!tryParseDoubleWithPoint(partNoUnit, out double length))
                     return false;
+
+                if (i != parts.Count - 1 && length >= 60)
+                    return false;
+                if (i != 0 && partNoUnit.Contains('.'))
+                    return false;
+
                 int scale = getLengthScale(part);
                 totalLength += length * scale;
                 minScale = Math.Min(minScale, scale);
             }
-
             return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
     }

From de25830b2ba1b0a696331d79da54f2ea7605a8e2 Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Fri, 22 Jul 2022 03:27:08 +0800
Subject: [PATCH 027/709] Add more test cases

---
 .../NonVisual/Filtering/FilterQueryParserTest.cs      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 9f97c39462..8f17410cad 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -126,9 +126,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
             new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1) },
             new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1) },
             new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
             new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "0:2:35", TimeSpan.FromSeconds(155), TimeSpan.FromSeconds(1) },
+            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1) },
+            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1) },
+            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
         };
 
         [Test]

From b36e23c0da7c02e61d87862bbe30eb5f8b3ccc1e Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Fri, 22 Jul 2022 03:30:31 +0800
Subject: [PATCH 028/709] Simplify the regex expression

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 25dd342353..9245c13243 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -315,7 +315,7 @@ namespace osu.Game.Screens.Select
         {
             List<string> parts = new List<string>();
 
-            if (Regex.IsMatch(val, @"^\d+(:\d+(:\d+)?)?$")) // formats like 12:34
+            if (Regex.IsMatch(val, @"^\d+(:\d+){1,2}$")) // formats like 12:34
             {
                 string[] splited = val.Split(':');
                 for (int i = splited.Length - 1; i >= 0; i--)

From 80e82763e35304022e9c42a35a4f4c18fba7ef2e Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Fri, 22 Jul 2022 12:09:47 +0800
Subject: [PATCH 029/709] Add negative test cases

---
 .../Filtering/FilterQueryParserTest.cs        | 61 ++++++++++++-------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 8f17410cad..4b20fc42c9 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -120,35 +120,54 @@ namespace osu.Game.Tests.NonVisual.Filtering
 
         private static readonly object[] length_query_examples =
         {
-            new object[] { "6ms", TimeSpan.FromMilliseconds(6), TimeSpan.FromMilliseconds(1) },
-            new object[] { "23s", TimeSpan.FromSeconds(23), TimeSpan.FromSeconds(1) },
-            new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1) },
-            new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1) },
-            new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1) },
-            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
-            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1) },
-            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
-            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
-            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1) },
-            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
+            new object[] { "23s", TimeSpan.FromSeconds(23), TimeSpan.FromSeconds(1), true },
+            new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1), true },
+            new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1), true },
+            new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1), true },
+            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1), true },
+            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1), true },
+            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
+            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1), true },
+            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
+            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
+            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1), true },
+            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1), true },
+            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1), true },
+            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1), true },
+            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1), true },
+            new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1), true },
+            new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1), true },
+            new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1), true },
+            new object[] { "7.5m27s", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "7m27", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "7m7m7m", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "7m70s", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "5s6m", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "0:", new TimeSpan(), new TimeSpan(), false },
+            new object[] { ":0", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "0:3:", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "3:15.5", new TimeSpan(), new TimeSpan(), false },
         };
 
         [Test]
         [TestCaseSource(nameof(length_query_examples))]
-        public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale)
+        public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale, bool isValid)
         {
             string query = $"length={lengthQuery} time";
             var filterCriteria = new FilterCriteria();
             FilterQueryParser.ApplyQueries(filterCriteria, query);
-            Assert.AreEqual("time", filterCriteria.SearchText.Trim());
-            Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
-            Assert.AreEqual(expectedLength.TotalMilliseconds - scale.TotalMilliseconds / 2.0, filterCriteria.Length.Min);
-            Assert.AreEqual(expectedLength.TotalMilliseconds + scale.TotalMilliseconds / 2.0, filterCriteria.Length.Max);
+            if (isValid)
+            {
+                Assert.AreEqual("time", filterCriteria.SearchText.Trim());
+                Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
+                Assert.AreEqual(expectedLength.TotalMilliseconds - scale.TotalMilliseconds / 2.0, filterCriteria.Length.Min);
+                Assert.AreEqual(expectedLength.TotalMilliseconds + scale.TotalMilliseconds / 2.0, filterCriteria.Length.Max);
+            }
+            else
+            {
+                Assert.AreEqual(false, filterCriteria.Length.HasFilter);
+            }
+            
         }
 
         [Test]

From 7c222505e941f0afd2f4925cacb3922c6d10938a Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Fri, 22 Jul 2022 14:24:17 +0800
Subject: [PATCH 030/709] Simplify length parsing

---
 .../Filtering/FilterQueryParserTest.cs        |  1 -
 osu.Game/Screens/Select/FilterQueryParser.cs  | 22 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 4b20fc42c9..f08bd09cf5 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -167,7 +167,6 @@ namespace osu.Game.Tests.NonVisual.Filtering
             {
                 Assert.AreEqual(false, filterCriteria.Length.HasFilter);
             }
-            
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 9245c13243..b8c85c5ce0 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -317,18 +317,18 @@ namespace osu.Game.Screens.Select
 
             if (Regex.IsMatch(val, @"^\d+(:\d+){1,2}$")) // formats like 12:34
             {
-                string[] splited = val.Split(':');
-                for (int i = splited.Length - 1; i >= 0; i--)
-                    parts.Add(splited[i] + "smh"[splited.Length - i - 1]);
-            }
-            else if (Regex.IsMatch(val, @"^(\d+(\.\d+)?[hms]){1,3}$")) // formats like 1h2m3s
-            {
-                if (!"hms".Contains(Regex.Replace(val, @"[\d\.]", "")))
-                    return false;
+                List<string> splitted = val.Split(':').ToList();
+                while (splitted.Count < 3)
+                    splitted.Insert(0, "0");
 
-                string[] splited = Regex.Split(val, @"(?<=[hms])").Where(x => x.Length > 0).ToArray();
-                for (int i = splited.Length - 1; i >= 0; i--)
-                    parts.Add(splited[i]);
+                parts.Add(splitted[2] + 's');
+                parts.Add(splitted[1] + 'm');
+                parts.Add(splitted[0] + 'h');                
+            }
+            else if (Regex.IsMatch(val, @"^(\d+(\.\d+)?[hms]){1,3}$") && "hms".Contains(Regex.Replace(val, @"[\d\.]", ""))) // formats like 1h2m3s
+            {
+                string[] splitted = Regex.Split(val, @"(?<=[hms])").Where(x => x.Length > 0).Reverse().ToArray();
+                parts.AddRange(splitted);
             }
             else if (Regex.IsMatch(val, @"^\d+(\.\d+)?$")) // only one number
             {

From 1220250bb677567498a10e4f9604ce8291bc8b3d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jul 2022 07:26:34 +0300
Subject: [PATCH 031/709] Improve test scene and add failing test case

---
 osu.Game.Tests/Resources/TestResources.cs     |  2 +-
 .../SongSelect/TestSceneTopLocalRank.cs       | 79 ++++++++++++++++---
 2 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index ee29cc8644..37bcef0414 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Tests.Resources
                 [HitResult.SmallTickMiss] = 25,
                 [HitResult.LargeTickHit] = 100,
                 [HitResult.LargeTickMiss] = 50,
-                [HitResult.SmallBonus] = 10,
+                [HitResult.LargeBonus] = 10,
                 [HitResult.SmallBonus] = 50
             },
         };
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
index 05b5c5c0cd..d998c4e161 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -13,6 +15,7 @@ using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Tests.Resources;
@@ -54,6 +57,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Scale = new Vector2(10),
                 });
             });
+
+            AddAssert("No rank displayed initially", () => topLocalRank.Rank == null);
         }
 
         [Test]
@@ -61,8 +66,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             ScoreInfo testScoreInfo = null;
 
-            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
-
             AddStep("Add score for current user", () =>
             {
                 testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
@@ -73,15 +76,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
-            AddAssert("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
 
             AddStep("Delete score", () =>
             {
                 scoreManager.Delete(testScoreInfo);
             });
 
-            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
+            AddUntilStep("No rank displayed", () => topLocalRank.Rank == null);
         }
 
         [Test]
@@ -99,13 +101,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Wait for initial presence", () => topLocalRank.IsPresent);
+            AddUntilStep("Wait for initial display", () => topLocalRank.Rank == ScoreRank.B);
 
             AddStep("Change ruleset", () => Ruleset.Value = rulesets.GetRuleset("fruits"));
-            AddUntilStep("Became not present", () => !topLocalRank.IsPresent);
+            AddUntilStep("No rank displayed", () => topLocalRank.Rank == null);
 
             AddStep("Change ruleset back", () => Ruleset.Value = rulesets.GetRuleset("osu"));
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
+            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
         }
 
         [Test]
@@ -113,8 +115,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             ScoreInfo testScoreInfo = null;
 
-            AddAssert("Initially not present", () => !topLocalRank.IsPresent);
-
             AddStep("Add score for current user", () =>
             {
                 testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
@@ -125,8 +125,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Became present", () => topLocalRank.IsPresent);
-            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
 
             AddStep("Add higher score for current user", () =>
             {
@@ -135,11 +134,65 @@ namespace osu.Game.Tests.Visual.SongSelect
                 testScoreInfo2.User = API.LocalUser.Value;
                 testScoreInfo2.Rank = ScoreRank.S;
                 testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
+                testScoreInfo2.Statistics = new Dictionary<HitResult, int>
+                {
+                    [HitResult.Miss] = 0,
+                    [HitResult.Perfect] = 970,
+                    [HitResult.SmallTickHit] = 75,
+                    [HitResult.LargeTickHit] = 150,
+                    [HitResult.LargeBonus] = 10,
+                    [HitResult.SmallBonus] = 50
+                };
 
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("Correct rank", () => topLocalRank.Rank == ScoreRank.S);
+            AddUntilStep("S rank displayed", () => topLocalRank.Rank == ScoreRank.S);
+        }
+
+        [Test]
+        public void TestLegacyScore()
+        {
+            ScoreInfo testScoreInfo = null;
+
+            AddStep("Add legacy score for current user", () =>
+            {
+                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+
+                testScoreInfo.User = API.LocalUser.Value;
+                testScoreInfo.Rank = ScoreRank.B;
+                testScoreInfo.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo, ScoringMode.Classic).GetResultSafely();
+
+                scoreManager.Import(testScoreInfo);
+            });
+
+            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
+
+            AddStep("Add higher score for current user", () =>
+            {
+                var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
+
+                testScoreInfo2.User = API.LocalUser.Value;
+                testScoreInfo2.Rank = ScoreRank.S;
+                testScoreInfo2.Statistics = new Dictionary<HitResult, int>
+                {
+                    [HitResult.Miss] = 0,
+                    [HitResult.Perfect] = 970,
+                    [HitResult.SmallTickHit] = 75,
+                    [HitResult.LargeTickHit] = 150,
+                    [HitResult.LargeBonus] = 10,
+                    [HitResult.SmallBonus] = 50
+                };
+
+                testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo).GetResultSafely();
+
+                // ensure standardised total score is less than classic, otherwise this test is pointless.
+                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
+
+                scoreManager.Import(testScoreInfo2);
+            });
+
+            AddUntilStep("S rank displayed", () => topLocalRank.Rank == ScoreRank.S);
         }
     }
 }

From 727fe76b6090e2071507e1e1622e1f79fd2d22ca Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jul 2022 08:09:00 +0300
Subject: [PATCH 032/709] Fix `TopLocalRank` hacking around presence to hide on
 null rank

Fixed this here because that blocks `Schedule` from running, and I don't
want to add another override to the `IsPresent` flag.
---
 .../SongSelect/TestSceneTopLocalRank.cs       | 20 ++++++-------
 .../Online/Leaderboards/UpdateableRank.cs     |  2 +-
 .../Screens/Select/Carousel/TopLocalRank.cs   | 29 ++++++++++++++-----
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
index d998c4e161..90d7aaacc3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 });
             });
 
-            AddAssert("No rank displayed initially", () => topLocalRank.Rank == null);
+            AddAssert("No rank displayed initially", () => topLocalRank.DisplayedRank == null);
         }
 
         [Test]
@@ -76,14 +76,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
             AddStep("Delete score", () =>
             {
                 scoreManager.Delete(testScoreInfo);
             });
 
-            AddUntilStep("No rank displayed", () => topLocalRank.Rank == null);
+            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
         }
 
         [Test]
@@ -101,13 +101,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("Wait for initial display", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("Wait for initial display", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
             AddStep("Change ruleset", () => Ruleset.Value = rulesets.GetRuleset("fruits"));
-            AddUntilStep("No rank displayed", () => topLocalRank.Rank == null);
+            AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
 
             AddStep("Change ruleset back", () => Ruleset.Value = rulesets.GetRuleset("osu"));
-            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
         }
 
         [Test]
@@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
             AddStep("Add higher score for current user", () =>
             {
@@ -147,7 +147,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("S rank displayed", () => topLocalRank.Rank == ScoreRank.S);
+            AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S);
         }
 
         [Test]
@@ -166,7 +166,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo);
             });
 
-            AddUntilStep("B rank displayed", () => topLocalRank.Rank == ScoreRank.B);
+            AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
             AddStep("Add higher score for current user", () =>
             {
@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("S rank displayed", () => topLocalRank.Rank == ScoreRank.S);
+            AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S);
         }
     }
 }
diff --git a/osu.Game/Online/Leaderboards/UpdateableRank.cs b/osu.Game/Online/Leaderboards/UpdateableRank.cs
index e4f5f72886..e640fe8494 100644
--- a/osu.Game/Online/Leaderboards/UpdateableRank.cs
+++ b/osu.Game/Online/Leaderboards/UpdateableRank.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Online.Leaderboards
             set => Model = value;
         }
 
-        public UpdateableRank(ScoreRank? rank)
+        public UpdateableRank(ScoreRank? rank = null)
         {
             Rank = rank;
         }
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index cc01f61c57..033da61461 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -5,9 +5,12 @@
 
 using System;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Models;
@@ -20,7 +23,7 @@ using Realms;
 
 namespace osu.Game.Screens.Select.Carousel
 {
-    public class TopLocalRank : UpdateableRank
+    public class TopLocalRank : CompositeDrawable
     {
         private readonly BeatmapInfo beatmapInfo;
 
@@ -34,13 +37,25 @@ namespace osu.Game.Screens.Select.Carousel
         private IAPIProvider api { get; set; }
 
         private IDisposable scoreSubscription;
+        private CancellationTokenSource scoreOrderCancellationSource;
+
+        private readonly UpdateableRank updateable;
+
+        public ScoreRank? DisplayedRank => updateable.Rank;
 
         public TopLocalRank(BeatmapInfo beatmapInfo)
-            : base(null)
         {
             this.beatmapInfo = beatmapInfo;
 
-            Size = new Vector2(40, 20);
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = updateable = new UpdateableRank
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(40, 20),
+                Alpha = 0,
+            };
         }
 
         protected override void LoadComplete()
@@ -59,19 +74,17 @@ namespace osu.Game.Screens.Select.Carousel
                          .OrderByDescending(s => s.TotalScore),
                     (items, _, _) =>
                     {
-                        Rank = items.FirstOrDefault()?.Rank;
-                        // Required since presence is changed via IsPresent override
-                        Invalidate(Invalidation.Presence);
+                        updateable.Rank = items.FirstOrDefault()?.Rank;
+                        updateable.Alpha = updateable.Rank != null ? 1 : 0;
                     });
             }, true);
         }
 
-        public override bool IsPresent => base.IsPresent && Rank != null;
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
+            scoreOrderCancellationSource?.Cancel();
             scoreSubscription?.Dispose();
         }
     }

From 1d0306810ab63e471a459c5488bef69cfe96610c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jul 2022 08:13:05 +0300
Subject: [PATCH 033/709] Fix `TopLocalRank` not handling legacy scores
 properly

---
 .../Screens/Select/Carousel/TopLocalRank.cs   | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index 033da61461..d372cb8dbc 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -33,6 +34,9 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved]
         private RealmAccess realm { get; set; }
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -70,14 +74,29 @@ namespace osu.Game.Screens.Select.Carousel
                          .Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0"
                                  + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1"
                                  + $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2"
-                                 + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName)
-                         .OrderByDescending(s => s.TotalScore),
-                    (items, _, _) =>
-                    {
-                        updateable.Rank = items.FirstOrDefault()?.Rank;
-                        updateable.Alpha = updateable.Rank != null ? 1 : 0;
-                    });
+                                 + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName),
+                    localScoresChanged);
             }, true);
+
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception error)
+            {
+                // This subscription may fire from changes to linked beatmaps, which we don't care about.
+                // It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
+                if (changes?.HasCollectionChanges() == false)
+                    return;
+
+                scoreOrderCancellationSource?.Cancel();
+
+                scoreManager.OrderByTotalScoreAsync(sender.Detach().ToArray(), (scoreOrderCancellationSource = new CancellationTokenSource()).Token)
+                            .ContinueWith(ordered => Schedule(() =>
+                            {
+                                if (scoreOrderCancellationSource.IsCancellationRequested)
+                                    return;
+
+                                updateable.Rank = ordered.GetResultSafely().FirstOrDefault()?.Rank;
+                                updateable.Alpha = updateable.Rank != null ? 1 : 0;
+                            }), TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From 3aecd288e22d985bb42b934bfc749fbe2f73b97d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jul 2022 09:25:06 +0300
Subject: [PATCH 034/709] Enable NRT on `TopLocalRank`

---
 .../SongSelect/TestSceneTopLocalRank.cs       | 25 +++++++++----------
 .../Screens/Select/Carousel/TopLocalRank.cs   | 16 ++++++------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
index 90d7aaacc3..b122898346 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -10,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -25,10 +24,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneTopLocalRank : OsuTestScene
     {
-        private RulesetStore rulesets;
-        private BeatmapManager beatmapManager;
-        private ScoreManager scoreManager;
-        private TopLocalRank topLocalRank;
+        private RulesetStore rulesets = null!;
+        private BeatmapManager beatmapManager = null!;
+        private ScoreManager scoreManager = null!;
+        private TopLocalRank topLocalRank = null!;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -64,7 +63,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestBasicImportDelete()
         {
-            ScoreInfo testScoreInfo = null;
+            ScoreInfo? testScoreInfo = null;
 
             AddStep("Add score for current user", () =>
             {
@@ -80,7 +79,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Delete score", () =>
             {
-                scoreManager.Delete(testScoreInfo);
+                scoreManager.Delete(testScoreInfo.AsNonNull());
             });
 
             AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
@@ -113,7 +112,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestHigherScoreSet()
         {
-            ScoreInfo testScoreInfo = null;
+            ScoreInfo? testScoreInfo = null;
 
             AddStep("Add score for current user", () =>
             {
@@ -133,7 +132,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 testScoreInfo2.User = API.LocalUser.Value;
                 testScoreInfo2.Rank = ScoreRank.S;
-                testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
+                testScoreInfo2.TotalScore = testScoreInfo.AsNonNull().TotalScore + 1;
                 testScoreInfo2.Statistics = new Dictionary<HitResult, int>
                 {
                     [HitResult.Miss] = 0,
@@ -153,7 +152,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestLegacyScore()
         {
-            ScoreInfo testScoreInfo = null;
+            ScoreInfo? testScoreInfo = null;
 
             AddStep("Add legacy score for current user", () =>
             {
@@ -184,10 +183,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                     [HitResult.SmallBonus] = 50
                 };
 
-                testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo).GetResultSafely();
+                testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo.AsNonNull()).GetResultSafely();
 
                 // ensure standardised total score is less than classic, otherwise this test is pointless.
-                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
+                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.AsNonNull().TotalScore);
 
                 scoreManager.Import(testScoreInfo2);
             });
diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index d372cb8dbc..2a9dae6712 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Threading;
@@ -29,19 +27,19 @@ namespace osu.Game.Screens.Select.Carousel
         private readonly BeatmapInfo beatmapInfo;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
         [Resolved]
-        private ScoreManager scoreManager { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
-        private IDisposable scoreSubscription;
-        private CancellationTokenSource scoreOrderCancellationSource;
+        private IDisposable? scoreSubscription;
+        private CancellationTokenSource? scoreOrderCancellationSource;
 
         private readonly UpdateableRank updateable;
 
@@ -78,7 +76,7 @@ namespace osu.Game.Screens.Select.Carousel
                     localScoresChanged);
             }, true);
 
-            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception error)
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception _)
             {
                 // This subscription may fire from changes to linked beatmaps, which we don't care about.
                 // It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.

From 3f2c3413691d1745b7688b01b0fbe159cc633ec2 Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Sat, 23 Jul 2022 18:13:19 +0800
Subject: [PATCH 035/709] Simplify length parsing

---
 .../Filtering/FilterQueryParserTest.cs        |  1 +
 osu.Game/Screens/Select/FilterQueryParser.cs  | 42 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index f08bd09cf5..181b740729 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -138,6 +138,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
             new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1), true },
             new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1), true },
             new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1), true },
+            new object[] { "1h20s", TimeSpan.FromSeconds(3620), TimeSpan.FromSeconds(1), true },
             new object[] { "7.5m27s", new TimeSpan(), new TimeSpan(), false },
             new object[] { "7m27", new TimeSpan(), new TimeSpan(), false },
             new object[] { "7m7m7m", new TimeSpan(), new TimeSpan(), false },
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index b8c85c5ce0..19fb8665d2 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -129,6 +129,16 @@ namespace osu.Game.Screens.Select
             value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
             return Enum.TryParse(value, true, out result);
         }
+        private static bool tryMatchRegex(string value, string regex, ref GroupCollection result)
+        {
+            Match matchs = Regex.Match(value, regex);
+            if (matchs.Success)
+            {
+                result = matchs.Groups;
+                return true;
+            }
+            return false;
+        }
 
         /// <summary>
         /// Attempts to parse a keyword filter with the specified <paramref name="op"/> and textual <paramref name="value"/>.
@@ -314,28 +324,22 @@ namespace osu.Game.Screens.Select
         private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
         {
             List<string> parts = new List<string>();
+            GroupCollection groups = null;
 
-            if (Regex.IsMatch(val, @"^\d+(:\d+){1,2}$")) // formats like 12:34
+            if (
+                tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$", ref groups) ||
+                tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$", ref groups) ||
+                tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$", ref groups)
+            )
             {
-                List<string> splitted = val.Split(':').ToList();
-                while (splitted.Count < 3)
-                    splitted.Insert(0, "0");
-
-                parts.Add(splitted[2] + 's');
-                parts.Add(splitted[1] + 'm');
-                parts.Add(splitted[0] + 'h');                
+                if (groups["seconds"].Success)
+                    parts.Add(groups["seconds"].Value + "s");
+                if (groups["minutes"].Success)
+                    parts.Add(groups["minutes"].Value + "m");
+                if (groups["hours"].Success)
+                    parts.Add(groups["hours"].Value + "h");
             }
-            else if (Regex.IsMatch(val, @"^(\d+(\.\d+)?[hms]){1,3}$") && "hms".Contains(Regex.Replace(val, @"[\d\.]", ""))) // formats like 1h2m3s
-            {
-                string[] splitted = Regex.Split(val, @"(?<=[hms])").Where(x => x.Length > 0).Reverse().ToArray();
-                parts.AddRange(splitted);
-            }
-            else if (Regex.IsMatch(val, @"^\d+(\.\d+)?$")) // only one number
-            {
-                parts.Add(val + 's');
-            }
-
-            if (parts.Count == 0)
+            else
                 return false;
 
             double totalLength = 0;

From aaad2e474ce271166de0aa9655352cc70cd4db07 Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Sat, 23 Jul 2022 21:43:27 +0800
Subject: [PATCH 036/709] Refactor the multiple regex checks in criteria
 parsing

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 35 +++++++++-----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 19fb8665d2..75574c061d 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -129,15 +129,14 @@ namespace osu.Game.Screens.Select
             value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
             return Enum.TryParse(value, true, out result);
         }
-        private static bool tryMatchRegex(string value, string regex, ref GroupCollection result)
+        private static GroupCollection tryMatchRegex(string value, string regex)
         {
             Match matchs = Regex.Match(value, regex);
             if (matchs.Success)
             {
-                result = matchs.Groups;
-                return true;
+                return matchs.Groups;
             }
-            return false;
+            return null;
         }
 
         /// <summary>
@@ -324,24 +323,22 @@ namespace osu.Game.Screens.Select
         private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
         {
             List<string> parts = new List<string>();
-            GroupCollection groups = null;
 
-            if (
-                tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$", ref groups) ||
-                tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$", ref groups) ||
-                tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$", ref groups)
-            )
-            {
-                if (groups["seconds"].Success)
-                    parts.Add(groups["seconds"].Value + "s");
-                if (groups["minutes"].Success)
-                    parts.Add(groups["minutes"].Value + "m");
-                if (groups["hours"].Success)
-                    parts.Add(groups["hours"].Value + "h");
-            }
-            else
+            GroupCollection match = null;
+            match ??= tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$");
+            match ??= tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$");
+            match ??= tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$");
+
+            if (match == null)
                 return false;
 
+            if (match["seconds"].Success)
+                parts.Add(match["seconds"].Value + "s");
+            if (match["minutes"].Success)
+                parts.Add(match["minutes"].Value + "m");
+            if (match["hours"].Success)
+                parts.Add(match["hours"].Value + "h");
+
             double totalLength = 0;
             int minScale = 3600000;
 

From ea97122425706078cd91944eb099dff9f4d8311d Mon Sep 17 00:00:00 2001
From: solstice23 <solstice233@gmail.com>
Date: Sat, 23 Jul 2022 21:47:51 +0800
Subject: [PATCH 037/709] Separate positive and negative test cases

---
 .../Filtering/FilterQueryParserTest.cs        | 91 ++++++++++---------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index 181b740729..ac16c59e5b 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -118,56 +118,63 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsNull(filterCriteria.BPM.Max);
         }
 
-        private static readonly object[] length_query_examples =
+        private static readonly object[] correct_length_query_examples =
         {
-            new object[] { "23s", TimeSpan.FromSeconds(23), TimeSpan.FromSeconds(1), true },
-            new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1), true },
-            new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1), true },
-            new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1), true },
-            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1), true },
-            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1), true },
-            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
-            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1), true },
-            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
-            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1), true },
-            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1), true },
-            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1), true },
-            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1), true },
-            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1), true },
-            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1), true },
-            new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1), true },
-            new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1), true },
-            new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1), true },
-            new object[] { "1h20s", TimeSpan.FromSeconds(3620), TimeSpan.FromSeconds(1), true },
-            new object[] { "7.5m27s", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "7m27", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "7m7m7m", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "7m70s", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "5s6m", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "0:", new TimeSpan(), new TimeSpan(), false },
-            new object[] { ":0", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "0:3:", new TimeSpan(), new TimeSpan(), false },
-            new object[] { "3:15.5", new TimeSpan(), new TimeSpan(), false },
+            new object[] { "23s", TimeSpan.FromSeconds(23), TimeSpan.FromSeconds(1) },
+            new object[] { "9m", TimeSpan.FromMinutes(9), TimeSpan.FromMinutes(1) },
+            new object[] { "0.25h", TimeSpan.FromHours(0.25), TimeSpan.FromHours(1) },
+            new object[] { "70", TimeSpan.FromSeconds(70), TimeSpan.FromSeconds(1) },
+            new object[] { "7m27s", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
+            new object[] { "7:27", TimeSpan.FromSeconds(447), TimeSpan.FromSeconds(1) },
+            new object[] { "1h2m3s", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "1h2m3.5s", TimeSpan.FromSeconds(3723.5), TimeSpan.FromSeconds(1) },
+            new object[] { "1:2:3", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "1:02:03", TimeSpan.FromSeconds(3723), TimeSpan.FromSeconds(1) },
+            new object[] { "6", TimeSpan.FromSeconds(6), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5s", TimeSpan.FromSeconds(6.5), TimeSpan.FromSeconds(1) },
+            new object[] { "6.5m", TimeSpan.FromMinutes(6.5), TimeSpan.FromMinutes(1) },
+            new object[] { "6h5m", TimeSpan.FromMinutes(365), TimeSpan.FromMinutes(1) },
+            new object[] { "65m", TimeSpan.FromMinutes(65), TimeSpan.FromMinutes(1) },
+            new object[] { "90s", TimeSpan.FromSeconds(90), TimeSpan.FromSeconds(1) },
+            new object[] { "80m20s", TimeSpan.FromSeconds(4820), TimeSpan.FromSeconds(1) },
+            new object[] { "1h20s", TimeSpan.FromSeconds(3620), TimeSpan.FromSeconds(1) },
         };
 
         [Test]
-        [TestCaseSource(nameof(length_query_examples))]
-        public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale, bool isValid)
+        [TestCaseSource(nameof(correct_length_query_examples))]
+        public void TestApplyLengthQueries(string lengthQuery, TimeSpan expectedLength, TimeSpan scale)
         {
             string query = $"length={lengthQuery} time";
             var filterCriteria = new FilterCriteria();
             FilterQueryParser.ApplyQueries(filterCriteria, query);
-            if (isValid)
-            {
-                Assert.AreEqual("time", filterCriteria.SearchText.Trim());
-                Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
-                Assert.AreEqual(expectedLength.TotalMilliseconds - scale.TotalMilliseconds / 2.0, filterCriteria.Length.Min);
-                Assert.AreEqual(expectedLength.TotalMilliseconds + scale.TotalMilliseconds / 2.0, filterCriteria.Length.Max);
-            }
-            else
-            {
-                Assert.AreEqual(false, filterCriteria.Length.HasFilter);
-            }
+            Assert.AreEqual("time", filterCriteria.SearchText.Trim());
+            Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
+            Assert.AreEqual(expectedLength.TotalMilliseconds - scale.TotalMilliseconds / 2.0, filterCriteria.Length.Min);
+            Assert.AreEqual(expectedLength.TotalMilliseconds + scale.TotalMilliseconds / 2.0, filterCriteria.Length.Max);
+        }
+
+        private static readonly object[] incorrect_length_query_examples =
+        {
+            new object[] { "7.5m27s" },
+            new object[] { "7m27" },
+            new object[] { "7m7m7m" },
+            new object[] { "7m70s" },
+            new object[] { "5s6m" },
+            new object[] { "0:" },
+            new object[] { ":0" },
+            new object[] { "0:3:" },
+            new object[] { "3:15.5" },
+        };
+
+        [Test]
+        [TestCaseSource(nameof(incorrect_length_query_examples))]
+        public void TestInvalidLengthQueries(string lengthQuery)
+        {
+            string query = $"length={lengthQuery} time";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(false, filterCriteria.Length.HasFilter);
         }
 
         [Test]

From da7d297d85e4ae5d59747dac3ae8686e1849433f Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Tue, 26 Jul 2022 19:07:25 +0200
Subject: [PATCH 038/709] Adjust parameters

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index ef3eaf2a9d..716fa990c9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -43,17 +43,13 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             for (int i = 0; i < positionInfos.Count; i++)
             {
-                bool invertFlow = false;
-
                 if (i == 0 ||
                     (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6) ||
                     OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
-                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.25))
+                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.3))
                 {
-                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0015f);
-
-                    if (rng.NextDouble() < 0.6)
-                        invertFlow = true;
+                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0012f);
+                    flowDirection = !flowDirection;
                 }
 
                 if (i == 0)
@@ -64,18 +60,13 @@ namespace osu.Game.Rulesets.Osu.Mods
                 else
                 {
                     float flowChangeOffset = 0;
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0015f);
+                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
 
                     if (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6)
                     {
                         flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
-
-                        if (rng.NextDouble() < 0.8)
-                            invertFlow = true;
-                    }
-
-                    if (invertFlow)
                         flowDirection = !flowDirection;
+                    }
 
                     positionInfos[i].RelativeAngle = getRelativeTargetAngle(
                         positionInfos[i].DistanceFromPrevious,
@@ -94,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
         private static float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            float angle = (float)(3 / (1 + 200 * Math.Exp(0.016 * (targetDistance - 466))) + 0.45 + offset);
+            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 320))) + 0.5 + offset);
             float relativeAngle = (float)Math.PI - angle;
             return flowDirection ? -relativeAngle : relativeAngle;
         }

From b2e7da5aa06189bf52e0f5e38bf7cb9bd8b6a712 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 28 Jul 2022 18:37:12 +0200
Subject: [PATCH 039/709] Add basic Queue based implementation of KPS

---
 .../Gameplay/TestSceneKeysPerSecondCounter.cs |  10 ++
 .../Screens/Play/HUD/KeysPerSecondCounter.cs  | 125 ++++++++++++++++++
 osu.Game/Screens/Play/KeyCounter.cs           |   2 +
 3 files changed, 137 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
new file mode 100644
index 0000000000..451e297e05
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneKeysPerSecondCounter
+    {
+        
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
new file mode 100644
index 0000000000..dc9a51dbf3
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
@@ -0,0 +1,125 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class KeysPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
+    {
+        private static Queue<DateTime>? timestamps;
+
+        private static event Action? onNewInput;
+        private readonly TimeSpan refreshSpan = TimeSpan.FromSeconds(1);
+
+        private const float alpha_when_invalid = 0.3f;
+        private readonly Bindable<bool> valid = new Bindable<bool>();
+
+        public static void AddTimestamp()
+        {
+            timestamps?.Enqueue(DateTime.Now);
+            onNewInput?.Invoke();
+        }
+
+        protected override double RollingDuration => 250;
+
+        public bool UsesFixedAnchor { get; set; }
+
+        public KeysPerSecondCounter()
+        {
+            timestamps ??= new Queue<DateTime>();
+            Current.Value = 0;
+            onNewInput += updateCounter;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = colours.BlueLighter;
+            valid.BindValueChanged(e =>
+                DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateCounter();
+        }
+
+        protected override void Update()
+        {
+            if (timestamps != null)
+            {
+                if (timestamps.TryPeek(out var earliest) && DateTime.Now - earliest >= refreshSpan)
+                    timestamps.Dequeue();
+            }
+
+            updateCounter();
+
+            base.Update();
+        }
+
+        private void updateCounter()
+        {
+            valid.Value = timestamps != null;
+            Current.Value = timestamps?.Count ?? 0;
+        }
+
+        protected override IHasText CreateText() => new TextComponent
+        {
+            Alpha = alpha_when_invalid
+        };
+
+        private class TextComponent : CompositeDrawable, IHasText
+        {
+            public LocalisableString Text
+            {
+                get => text.Text;
+                set => text.Text = value;
+            }
+
+            private readonly OsuSpriteText text;
+
+            public TextComponent()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Spacing = new Vector2(2),
+                    Children = new Drawable[]
+                    {
+                        text = new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.Numeric.With(size: 16, fixedWidth: true)
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.Numeric.With(size: 8, fixedWidth: true),
+                            Text = @"KPS",
+                            Padding = new MarginPadding { Bottom = 1.5f }, // align baseline better
+                        }
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index 1e5ada5295..b8bbac9a7e 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
@@ -55,6 +56,7 @@ namespace osu.Game.Screens.Play
 
         public void Increment()
         {
+            KeysPerSecondCounter.AddTimestamp();
             if (!IsCounting)
                 return;
 

From 079150849a53ee3545a8b58c137bb7648fdb4b3d Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 28 Jul 2022 18:37:50 +0200
Subject: [PATCH 040/709] Add some tests

---
 .../Gameplay/TestSceneKeysPerSecondCounter.cs | 69 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
index 451e297e05..e20a83b54a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -1,10 +1,75 @@
 // 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.
 
+#nullable disable
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Input;
+
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneKeysPerSecondCounter
+    public class TestSceneKeysPerSecondCounter : OsuManualInputManagerTestScene
     {
-        
+        private KeysPerSecondCounter counter;
+
+        [SetUpSteps]
+        public void Setup()
+        {
+            createCounter();
+        }
+
+        private void createCounter() => AddStep("Create counter", () =>
+        {
+            Child = counter = new KeysPerSecondCounter
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(5)
+            };
+        });
+
+        [Test]
+        public void TestManualTrigger()
+        {
+            AddAssert("Counter = 0", () => counter.Current.Value == 0);
+            AddRepeatStep("manual trigger", KeysPerSecondCounter.AddTimestamp, 20);
+            AddAssert("Counter is not 0", () => counter.Current.Value > 0);
+        }
+
+        [Test]
+        public void TestKpsAsideKeyCounter()
+        {
+            AddStep("Create key counter display", () =>
+                Add(new KeyCounterDisplay
+                {
+                    Origin = Anchor.BottomCentre,
+                    Anchor = Anchor.BottomCentre,
+                    Y = 100,
+                    Children = new KeyCounter[]
+                    {
+                        new KeyCounterKeyboard(Key.W),
+                        new KeyCounterKeyboard(Key.X),
+                        new KeyCounterKeyboard(Key.C),
+                        new KeyCounterKeyboard(Key.V)
+                    }
+                })
+            );
+            AddAssert("Counter = 0", () => counter.Current.Value == 0);
+            addPressKeyStep(Key.W);
+            addPressKeyStep(Key.X);
+            addPressKeyStep(Key.C);
+            addPressKeyStep(Key.V);
+            AddAssert("Counter = 4", () => counter.Current.Value == 4);
+        }
+
+        private void addPressKeyStep(Key key)
+        {
+            AddStep($"Press {key} key", () => InputManager.Key(key));
+        }
     }
 }

From 89855cc1d6af208b5e132264e610b16a2386c8c4 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 31 Jul 2022 01:29:57 +0200
Subject: [PATCH 041/709] Change KPS Counter implementation base and add better
 replay integration

The counter implementaiton is now list based, and will not invalidate
previous hits by removing them but by testing if they are within the 1
second span, allowing better integration with replays and spectators.
---
 .../Screens/Play/HUD/KeysPerSecondCounter.cs  | 67 ++++++++++++++-----
 osu.Game/Screens/Play/KeyCounterDisplay.cs    |  2 +
 osu.Game/Screens/Play/Player.cs               |  4 ++
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
index dc9a51dbf3..d32ca1410a 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
@@ -1,17 +1,24 @@
 // 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.
 
+#nullable disable
+
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
+using osu.Framework.Timing;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -19,37 +26,71 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class KeysPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
     {
-        private static Queue<DateTime>? timestamps;
+        private static List<double> timestamps;
+        private static double maxTime = double.NegativeInfinity;
 
-        private static event Action? onNewInput;
-        private readonly TimeSpan refreshSpan = TimeSpan.FromSeconds(1);
+        private static event Action onNewInput;
 
+        private const int invalidation_timeout = 1000;
         private const float alpha_when_invalid = 0.3f;
+
         private readonly Bindable<bool> valid = new Bindable<bool>();
 
+        private static GameplayClock gameplayClock;
+        private static IClock referenceClock;
+
+        private static IClock clock => referenceClock ?? gameplayClock;
+
+        [Resolved(canBeNull: true)]
+        private DrawableRuleset drawableRuleset { get; set; }
+
+        [SettingSource("Smoothing time", "How smooth the counter should change\nThe more it is smooth, the less it's accurate.")]
+        public BindableNumber<double> SmoothingTime { get; } = new BindableNumber<double>(350)
+        {
+            MaxValue = 1000,
+            MinValue = 0
+        };
+
         public static void AddTimestamp()
         {
-            timestamps?.Enqueue(DateTime.Now);
+            Logger.Log($"Input timestamp attempt C: {clock.CurrentTime}ms | GC: {gameplayClock.CurrentTime} | RC: {referenceClock?.CurrentTime ?? -1} | Max: {maxTime})", level: LogLevel.Debug);
+
+            if (clock.CurrentTime >= maxTime)
+            {
+                Logger.Log("Input timestamp added.", level: LogLevel.Debug);
+                timestamps?.Add(clock.CurrentTime);
+                maxTime = timestamps?.Max() ?? clock.CurrentTime;
+            }
+
             onNewInput?.Invoke();
         }
 
-        protected override double RollingDuration => 250;
+        public static void Reset()
+        {
+            timestamps?.Clear();
+            maxTime = int.MinValue;
+        }
+
+        protected override double RollingDuration => SmoothingTime.Value;
 
         public bool UsesFixedAnchor { get; set; }
 
         public KeysPerSecondCounter()
         {
-            timestamps ??= new Queue<DateTime>();
+            timestamps ??= new List<double>();
             Current.Value = 0;
             onNewInput += updateCounter;
+            Scheduler.AddOnce(updateCounter);
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, GameplayClock clock)
         {
+            gameplayClock = clock;
             Colour = colours.BlueLighter;
             valid.BindValueChanged(e =>
                 DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));
+            referenceClock = drawableRuleset?.FrameStableClock;
         }
 
         protected override void LoadComplete()
@@ -61,21 +102,15 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void Update()
         {
-            if (timestamps != null)
-            {
-                if (timestamps.TryPeek(out var earliest) && DateTime.Now - earliest >= refreshSpan)
-                    timestamps.Dequeue();
-            }
+            base.Update();
 
             updateCounter();
-
-            base.Update();
         }
 
         private void updateCounter()
         {
-            valid.Value = timestamps != null;
-            Current.Value = timestamps?.Count ?? 0;
+            valid.Value = timestamps != null && MathHelper.ApproximatelyEquivalent(gameplayClock.CurrentTime, referenceClock.CurrentTime, 500);
+            Current.Value = timestamps?.Count(timestamp => clock.CurrentTime - timestamp is >= 0 and <= invalidation_timeout) ?? 0;
         }
 
         protected override IHasText CreateText() => new TextComponent
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index b6094726c0..aaf2e997f2 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
@@ -65,6 +66,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
+            KeysPerSecondCounter.Reset();
             config.BindWith(OsuSetting.KeyOverlay, configVisibility);
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9a058e45c5..fb2f556611 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,6 +34,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -1044,6 +1045,9 @@ namespace osu.Game.Screens.Play
             musicController.ResetTrackAdjustments();
 
             fadeOut();
+
+            KeysPerSecondCounter.Reset();
+
             return base.OnExiting(e);
         }
 

From bc059cc1d22ef01c4ec10aa6b58a1249febb1fdf Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 1 Aug 2022 21:46:01 +0100
Subject: [PATCH 042/709] Implemented KeepUpright

---
 osu.Game/Extensions/DrawableExtensions.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 35f2d61437..5b92600cd1 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -8,6 +8,7 @@ using osu.Game.Configuration;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 using osuTK;
+using System;
 
 namespace osu.Game.Extensions
 {
@@ -79,5 +80,24 @@ namespace osu.Game.Extensions
                     container.Add(child.CreateInstance());
             }
         }
+
+        /// <summary>
+        /// Keeps the drawable upright no matter the Rotation of its parents.
+        /// </summary>
+        /// <param name="drawable">The drawable.</param>
+        public static void KeepUpright(this Drawable drawable)
+        {
+            var result = drawable.Parent.DrawInfo;
+            var scale = result.Matrix.ExtractScale();
+            var rotation = new Matrix3(
+            result.Matrix.Row0 / scale.X,
+            result.Matrix.Row1 / scale.Y,
+            new Vector3(0.0f, 0.0f, 1.0f)
+            );
+            float angle = MathF.Atan2(rotation.M12, rotation.M11);
+            angle *= (360 / (2 * MathF.PI));
+            drawable.Rotation = -angle;
+        }
+
     }
 }

From df85bd74d7ab9eabd2c51b283ab0e15bafa25edc Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 1 Aug 2022 21:46:37 +0100
Subject: [PATCH 043/709] Keep TextSprites in SongProgressInfo upright

---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 69 ++++++++++++++-----
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 8f10e84509..520d0c661d 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -48,38 +48,67 @@ namespace osu.Game.Screens.Play.HUD
 
             Children = new Drawable[]
             {
-                timeCurrent = new OsuSpriteText
+                new Container
                 {
-                    Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
-                    Colour = colours.BlueLighter,
-                    Font = OsuFont.Numeric,
-                    Margin = new MarginPadding
+                    Origin = Anchor.BottomLeft,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
-                        Left = margin,
-                    },
+                        timeCurrent = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
+                        }
+                    }
                 },
-                progress = new OsuSpriteText
+                new Container
                 {
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,
-                    Colour = colours.BlueLighter,
-                    Font = OsuFont.Numeric,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        progress = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
+                        }
+                    }
                 },
-                timeLeft = new OsuSpriteText
+                new Container
                 {
                     Origin = Anchor.BottomRight,
                     Anchor = Anchor.BottomRight,
-                    Colour = colours.BlueLighter,
-                    Font = OsuFont.Numeric,
-                    Margin = new MarginPadding
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
                     {
-                        Right = margin,
-                    },
+                        timeLeft = new OsuSpriteText
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
+                            Margin = new MarginPadding
+                            {
+                                Right = margin,
+                            },
+                        }
+                    }
                 }
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            keepTextSpritesUpright();
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -106,5 +135,13 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         private string formatTime(TimeSpan timeSpan) => $"{(timeSpan < TimeSpan.Zero ? "-" : "")}{Math.Floor(timeSpan.Duration().TotalMinutes)}:{timeSpan.Duration().Seconds:D2}";
+
+        private void keepTextSpritesUpright()
+        {
+            timeCurrent.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
+            progress.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
+            timeLeft.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
+        }
+
     }
 }

From 78a98cdb9c23ef9b0827d77adfc8a07c571308bd Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Tue, 2 Aug 2022 17:03:02 +0100
Subject: [PATCH 044/709] Prevent TextSprites inside SongProgressInfo from
 being stretched or flipped

---
 osu.Game/Extensions/DrawableExtensions.cs     | 30 ++++++++++++++++---
 .../Screens/Play/HUD/DefaultSongProgress.cs   |  5 ++--
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs |  7 +++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 5b92600cd1..46105218c5 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -82,11 +82,12 @@ namespace osu.Game.Extensions
         }
 
         /// <summary>
-        /// Keeps the drawable upright no matter the Rotation of its parents.
+        /// Keeps the drawable upright and prevents it from being scaled or flipped with its Parent.
         /// </summary>
         /// <param name="drawable">The drawable.</param>
-        public static void KeepUpright(this Drawable drawable)
+        public static void KeepUprightAndUnstretched(this Drawable drawable)
         {
+            // Fix the rotation
             var result = drawable.Parent.DrawInfo;
             var scale = result.Matrix.ExtractScale();
             var rotation = new Matrix3(
@@ -94,9 +95,30 @@ namespace osu.Game.Extensions
             result.Matrix.Row1 / scale.Y,
             new Vector3(0.0f, 0.0f, 1.0f)
             );
-            float angle = MathF.Atan2(rotation.M12, rotation.M11);
+            rotation.Invert();
+            float angle = MathF.Atan(rotation.M12 / rotation.M11);
             angle *= (360 / (2 * MathF.PI));
-            drawable.Rotation = -angle;
+            drawable.Rotation = angle;
+
+            // Fix the scale (includes flip)
+            var containerOriginToSpaceOrigin = new Matrix3(
+                new Vector3(1.0f, 0.0f, 0.0f),
+                new Vector3(0.0f, 1.0f, 0.0f),
+                new Vector3(drawable.DrawSize.X / 2, drawable.DrawSize.Y / 2, 1.0f)
+                );
+            var containerOriginToSpaceOriginInverse = containerOriginToSpaceOrigin;
+            containerOriginToSpaceOriginInverse.Invert();
+            Matrix3 rotatedBack = (containerOriginToSpaceOriginInverse * (rotation * (containerOriginToSpaceOrigin * result.Matrix)));
+
+            bool xFliped = rotation.M11 < 0;
+            bool yFliped = rotation.M22 < 0;
+
+            var rotatedBackScale = rotatedBack.ExtractScale();
+
+            drawable.Scale = new Vector2(
+                (xFliped ? -1 : 1) / rotatedBackScale.X,
+                (yFliped ? -1 : 1) / rotatedBackScale.Y
+            );
         }
 
     }
diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 96a6c56860..9ed99ab5f6 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
@@ -16,7 +17,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultSongProgress : SongProgress
     {
-        private const float info_height = 20;
         private const float bottom_bar_height = 5;
         private const float graph_height = SquareGraph.Column.WIDTH * 6;
         private const float handle_height = 18;
@@ -67,7 +67,6 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.BottomLeft,
                     Anchor = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
-                    Height = info_height,
                 },
                 graph = new SongProgressGraph
                 {
@@ -180,7 +179,7 @@ namespace osu.Game.Screens.Play.HUD
         protected override void Update()
         {
             base.Update();
-            Height = bottom_bar_height + graph_height + handle_size.Y + info_height - graph.Y;
+            Height = bottom_bar_height + graph_height + handle_size.Y + info.Height - graph.Y;
         }
 
         private void updateBarVisibility()
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 520d0c661d..656498fc43 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Play.HUD
             if (clock != null)
                 gameplayClock = clock;
 
+            AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
                 new Container
@@ -138,9 +139,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void keepTextSpritesUpright()
         {
-            timeCurrent.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
-            progress.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
-            timeLeft.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUpright(timeCurrent); };
+            timeCurrent.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
+            progress.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
+            timeLeft.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
         }
 
     }

From bc21a2ed569a443bd03fb5e230aebc280fa1bcc1 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Tue, 2 Aug 2022 17:41:17 +0100
Subject: [PATCH 045/709] Remove unnecessary using directive

---
 osu.Game/Screens/Play/HUD/DefaultSongProgress.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 9ed99ab5f6..361e35ed45 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;

From 42d1bdfc95fe78555fd5ce0426bc79b6a4d6f736 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 5 Aug 2022 04:17:01 +0200
Subject: [PATCH 046/709] Move KPS calculation to a standalone class

---
 .../Gameplay/TestSceneKeyPerSecondCounter.cs  | 91 +++++++++++++++++++
 .../Gameplay/TestSceneKeysPerSecondCounter.cs |  4 +-
 .../HUD/KPSCounter/KeysPerSecondCalculator.cs | 91 +++++++++++++++++++
 .../{ => KPSCounter}/KeysPerSecondCounter.cs  | 63 ++-----------
 osu.Game/Screens/Play/KeyCounter.cs           |  4 +-
 osu.Game/Screens/Play/KeyCounterDisplay.cs    |  2 -
 osu.Game/Screens/Play/Player.cs               |  4 +-
 7 files changed, 195 insertions(+), 64 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs
 create mode 100644 osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
 rename osu.Game/Screens/Play/HUD/{ => KPSCounter}/KeysPerSecondCounter.cs (63%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs
new file mode 100644
index 0000000000..a2eaea29eb
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs
@@ -0,0 +1,91 @@
+// 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.
+
+#nullable disable
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD.KPSCounter;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneKeyPerSecondCounter : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+        protected override bool HasCustomSteps => false;
+        protected override bool Autoplay => true;
+
+        private GameplayClock gameplayClock;
+        private DrawableRuleset drawableRuleset;
+
+        // private DependencyProvidingContainer dependencyContainer;
+        private KeysPerSecondCounter counter;
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            /*
+            CreateTest(() => AddStep("Create components", () =>
+            {
+                Logger.Log($"{(Player != null ? Player.ToString() : "null")}", level: LogLevel.Debug);
+                dependencyContainer = new DependencyProvidingContainer
+                {
+                    RelativePositionAxes = Axes.Both,
+                };
+            }));
+        */
+        }
+
+        private void createCounter()
+        {
+            AddStep("Create counter", () =>
+            {
+                /*
+                if (!Contains(dependencyContainer))
+                {
+                    Add(dependencyContainer);
+                }
+
+                if (dependencyContainer.CachedDependencies.Length == 0)
+                {
+                    dependencyContainer.CachedDependencies = new (Type, object)[]
+                    {
+                        (typeof(GameplayClock), ,
+                        (typeof(DrawableRuleset),)
+                    };
+                }
+                Dependencies.Cache(gameplayClock = Player.GameplayClockContainer.GameplayClock));
+                */
+
+                Dependencies.Cache(gameplayClock = Player.GameplayClockContainer.GameplayClock);
+                Dependencies.Cache(drawableRuleset = Player.DrawableRuleset);
+
+                Add(counter = new KeysPerSecondCounter
+                    {
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        Scale = new Vector2(5),
+                        Position = new Vector2(10, 100)
+                    }
+                );
+            });
+            AddAssert("ensure counter added", () => Contains(counter));
+        }
+
+        [Test]
+        public void TestInGameTimeConsistency()
+        {
+            createCounter();
+
+            AddUntilStep("Wait until first note", () => counter.Current.Value != 0);
+            AddStep("Pause gameplay", () => gameplayClock.IsPaused.Value = true);
+            AddAssert("KPS = 1", () => counter.Current.Value == 1);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
index e20a83b54a..c8c31d1366 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using osuTK;
 using osuTK.Input;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestManualTrigger()
         {
             AddAssert("Counter = 0", () => counter.Current.Value == 0);
-            AddRepeatStep("manual trigger", KeysPerSecondCounter.AddTimestamp, 20);
+            AddRepeatStep("manual trigger", KeysPerSecondCalculator.AddInput, 20);
             AddAssert("Counter is not 0", () => counter.Current.Value > 0);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
new file mode 100644
index 0000000000..f9839abde4
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -0,0 +1,91 @@
+// 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.
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Screens.Play.HUD.KPSCounter
+{
+    public class KeysPerSecondCalculator : IDisposable
+    {
+        private static KeysPerSecondCalculator instance;
+
+        public static void AddInput()
+        {
+            instance?.onNewInput.Invoke();
+        }
+
+        public static KeysPerSecondCalculator GetInstance(GameplayClock gameplayClock = null, DrawableRuleset drawableRuleset = null)
+        {
+            if (instance != null) return instance;
+
+            try
+            {
+                return new KeysPerSecondCalculator(gameplayClock, drawableRuleset);
+            }
+            catch (ArgumentNullException)
+            {
+                return null;
+            }
+        }
+
+        private readonly List<double> timestamps;
+        private readonly GameplayClock gameplayClock;
+        private readonly DrawableRuleset drawableRuleset;
+
+        private event Action onNewInput;
+
+        private IClock workingClock => (IClock)drawableRuleset.FrameStableClock ?? gameplayClock;
+
+        // Having the rate from mods is preffered to using GameplayClock.TrueGameplayRate()
+        // as it returns 0 when paused in replays, not useful for players who want to "analyze" a replay.
+        private double rate => (drawableRuleset.Mods.FirstOrDefault(m => m is ModRateAdjust) as ModRateAdjust)?.SpeedChange.Value
+                               ?? 1;
+
+        private double maxTime = double.NegativeInfinity;
+
+        public bool Ready => workingClock != null && gameplayClock != null;
+        public int Value => timestamps.Count(isTimestampWithinSpan);
+
+        private KeysPerSecondCalculator(GameplayClock gameplayClock, DrawableRuleset drawableRuleset)
+        {
+            instance = this;
+            timestamps = new List<double>();
+            this.gameplayClock = gameplayClock ?? throw new ArgumentNullException(nameof(gameplayClock));
+            this.drawableRuleset = drawableRuleset;
+            onNewInput += addTimestamp;
+        }
+
+        private void addTimestamp()
+        {
+            if (workingClock != null && workingClock.CurrentTime >= maxTime)
+            {
+                timestamps.Add(workingClock.CurrentTime);
+                maxTime = workingClock.CurrentTime;
+            }
+        }
+
+        private bool isTimestampWithinSpan(double timestamp)
+        {
+            if (!Ready)
+                return false;
+
+            double span = 1000 * rate;
+            double relativeTime = workingClock.CurrentTime - timestamp;
+            return relativeTime >= 0 && relativeTime <= span;
+        }
+
+        public void Dispose()
+        {
+            instance = null;
+        }
+
+        ~KeysPerSecondCalculator() => Dispose();
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
similarity index 63%
rename from osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
rename to osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
index d32ca1410a..2fcca2ffce 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
@@ -3,17 +3,12 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Framework.Logging;
-using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -22,28 +17,20 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Screens.Play.HUD.KPSCounter
 {
     public class KeysPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
     {
-        private static List<double> timestamps;
-        private static double maxTime = double.NegativeInfinity;
-
-        private static event Action onNewInput;
-
-        private const int invalidation_timeout = 1000;
         private const float alpha_when_invalid = 0.3f;
 
         private readonly Bindable<bool> valid = new Bindable<bool>();
-
-        private static GameplayClock gameplayClock;
-        private static IClock referenceClock;
-
-        private static IClock clock => referenceClock ?? gameplayClock;
+        private GameplayClock gameplayClock;
 
         [Resolved(canBeNull: true)]
         private DrawableRuleset drawableRuleset { get; set; }
 
+        private KeysPerSecondCalculator calculator => KeysPerSecondCalculator.GetInstance(gameplayClock, drawableRuleset);
+
         [SettingSource("Smoothing time", "How smooth the counter should change\nThe more it is smooth, the less it's accurate.")]
         public BindableNumber<double> SmoothingTime { get; } = new BindableNumber<double>(350)
         {
@@ -51,66 +38,30 @@ namespace osu.Game.Screens.Play.HUD
             MinValue = 0
         };
 
-        public static void AddTimestamp()
-        {
-            Logger.Log($"Input timestamp attempt C: {clock.CurrentTime}ms | GC: {gameplayClock.CurrentTime} | RC: {referenceClock?.CurrentTime ?? -1} | Max: {maxTime})", level: LogLevel.Debug);
-
-            if (clock.CurrentTime >= maxTime)
-            {
-                Logger.Log("Input timestamp added.", level: LogLevel.Debug);
-                timestamps?.Add(clock.CurrentTime);
-                maxTime = timestamps?.Max() ?? clock.CurrentTime;
-            }
-
-            onNewInput?.Invoke();
-        }
-
-        public static void Reset()
-        {
-            timestamps?.Clear();
-            maxTime = int.MinValue;
-        }
-
         protected override double RollingDuration => SmoothingTime.Value;
 
         public bool UsesFixedAnchor { get; set; }
 
         public KeysPerSecondCounter()
         {
-            timestamps ??= new List<double>();
             Current.Value = 0;
-            onNewInput += updateCounter;
-            Scheduler.AddOnce(updateCounter);
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameplayClock clock)
+        private void load(OsuColour colours, GameplayClock clock, DrawableRuleset ruleset)
         {
             gameplayClock = clock;
             Colour = colours.BlueLighter;
             valid.BindValueChanged(e =>
                 DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));
-            referenceClock = drawableRuleset?.FrameStableClock;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateCounter();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            updateCounter();
-        }
-
-        private void updateCounter()
-        {
-            valid.Value = timestamps != null && MathHelper.ApproximatelyEquivalent(gameplayClock.CurrentTime, referenceClock.CurrentTime, 500);
-            Current.Value = timestamps?.Count(timestamp => clock.CurrentTime - timestamp is >= 0 and <= invalidation_timeout) ?? 0;
+            valid.Value = calculator.Ready;
+            Current.Value = calculator.Value;
         }
 
         protected override IHasText CreateText() => new TextComponent
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index b8bbac9a7e..044c9ee24e 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using osuTK;
 using osuTK.Graphics;
 
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play
 
         public void Increment()
         {
-            KeysPerSecondCounter.AddTimestamp();
+            KeysPerSecondCalculator.AddInput();
             if (!IsCounting)
                 return;
 
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index aaf2e997f2..b6094726c0 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Configuration;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
@@ -66,7 +65,6 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            KeysPerSecondCounter.Reset();
             config.BindWith(OsuSetting.KeyOverlay, configVisibility);
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index fb2f556611..88cd197076 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,7 +34,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -1046,7 +1046,7 @@ namespace osu.Game.Screens.Play
 
             fadeOut();
 
-            KeysPerSecondCounter.Reset();
+            KeysPerSecondCalculator.GetInstance().Dispose();
 
             return base.OnExiting(e);
         }

From 15fb4d8dd5f3b8ba0b53e34882ef14164c387aa6 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 5 Aug 2022 12:53:14 +0100
Subject: [PATCH 047/709] Change Implementation and name of
 KeepUprightAndUnstretched

---
 osu.Game/Extensions/DrawableExtensions.cs | 56 +++++++++++------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 46105218c5..fd5bbab567 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -81,45 +81,43 @@ namespace osu.Game.Extensions
             }
         }
 
+
         /// <summary>
         /// Keeps the drawable upright and prevents it from being scaled or flipped with its Parent.
         /// </summary>
         /// <param name="drawable">The drawable.</param>
-        public static void KeepUprightAndUnstretched(this Drawable drawable)
+        public static void KeepUprightAndUnscaled(this Drawable drawable)
         {
-            // Fix the rotation
-            var result = drawable.Parent.DrawInfo;
-            var scale = result.Matrix.ExtractScale();
-            var rotation = new Matrix3(
-            result.Matrix.Row0 / scale.X,
-            result.Matrix.Row1 / scale.Y,
-            new Vector3(0.0f, 0.0f, 1.0f)
-            );
-            rotation.Invert();
-            float angle = MathF.Atan(rotation.M12 / rotation.M11);
+            var parentMatrix = drawable.Parent.DrawInfo.Matrix;
+            float angle = MathF.Atan(parentMatrix.M12 / parentMatrix.M11);
             angle *= (360 / (2 * MathF.PI));
-            drawable.Rotation = angle;
 
-            // Fix the scale (includes flip)
-            var containerOriginToSpaceOrigin = new Matrix3(
-                new Vector3(1.0f, 0.0f, 0.0f),
-                new Vector3(0.0f, 1.0f, 0.0f),
-                new Vector3(drawable.DrawSize.X / 2, drawable.DrawSize.Y / 2, 1.0f)
-                );
-            var containerOriginToSpaceOriginInverse = containerOriginToSpaceOrigin;
-            containerOriginToSpaceOriginInverse.Invert();
-            Matrix3 rotatedBack = (containerOriginToSpaceOriginInverse * (rotation * (containerOriginToSpaceOrigin * result.Matrix)));
+            parentMatrix.Transpose();
+            parentMatrix.M13 = 0.0f;
+            parentMatrix.M23 = 0.0f;
 
-            bool xFliped = rotation.M11 < 0;
-            bool yFliped = rotation.M22 < 0;
+            if ((Math.Abs(Math.Abs(angle) - 90.0)) < 2.0f)
+            {
+                Matrix3 m = Matrix3.CreateRotationZ(MathHelper.DegreesToRadians(40.0f));
+                m.Transpose();
+                parentMatrix *= m;
+                drawable.Rotation = 40.0f;
+            }
+            else
+                drawable.Rotation = 0.0f;
 
-            var rotatedBackScale = rotatedBack.ExtractScale();
+            Matrix3 C = parentMatrix.Inverted();
+
+            float alpha, beta, sx, sy;
+            sy = C.M22;
+            alpha = C.M12 / C.M22;
+
+            beta = (C.M21 == 0.0f) ? 0.0f : 1 / ((C.M11 / C.M21) - alpha);
+            sx = (beta == 0.0f) ? C.M11 : C.M21 / beta;
+
+            drawable.Scale = new Vector2(sx, sy);
+            drawable.Shear = new Vector2(-alpha, -beta);
 
-            drawable.Scale = new Vector2(
-                (xFliped ? -1 : 1) / rotatedBackScale.X,
-                (yFliped ? -1 : 1) / rotatedBackScale.Y
-            );
         }
-
     }
 }

From 8618d9ea0d21ea9f67d9f2f3751c3b7cda08f614 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 5 Aug 2022 12:55:41 +0100
Subject: [PATCH 048/709] Implement GrowToFitContainer

---
 .../Graphics/Containers/GrowToFitContainer.cs | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/GrowToFitContainer.cs

diff --git a/osu.Game/Graphics/Containers/GrowToFitContainer.cs b/osu.Game/Graphics/Containers/GrowToFitContainer.cs
new file mode 100644
index 0000000000..6333718928
--- /dev/null
+++ b/osu.Game/Graphics/Containers/GrowToFitContainer.cs
@@ -0,0 +1,22 @@
+// 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 osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Graphics.Containers
+{
+    /// <summary>
+    /// A container that grows in size to fit its child and retains its size when its child shrinks
+    /// </summary>
+    public class GrowToFitContainer : Container
+    {
+        protected override void Update()
+        {
+            base.Update();
+            Height = Math.Max(Child.Height, Height);
+            Width = Math.Max(Child.Width, Width);
+        }
+    }
+
+}

From 12ef99a1a1534c255138eab4c336f385e145c144 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 5 Aug 2022 12:56:08 +0100
Subject: [PATCH 049/709] Fix text position

---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 656498fc43..8c9f3aaa8d 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -5,15 +5,22 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System;
 
+
 namespace osu.Game.Screens.Play.HUD
 {
     public class SongProgressInfo : Container
     {
+        private GrowToFitContainer timeCurrentContainer;
+        private GrowToFitContainer timeLeftContainer;
+        private GrowToFitContainer progressContainer;
+
         private OsuSpriteText timeCurrent;
         private OsuSpriteText timeLeft;
         private OsuSpriteText progress;
@@ -51,12 +58,14 @@ namespace osu.Game.Screens.Play.HUD
             {
                 new Container
                 {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = timeCurrentContainer = new GrowToFitContainer
                     {
-                        timeCurrent = new OsuSpriteText
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Child = timeCurrent = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
@@ -67,37 +76,37 @@ namespace osu.Game.Screens.Play.HUD
                 },
                 new Container
                 {
-                    Origin = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = timeLeftContainer = new GrowToFitContainer
                     {
-                        progress = new OsuSpriteText
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Child = progress = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
                             Colour = colours.BlueLighter,
                             Font = OsuFont.Numeric,
-                        }
+                         }
                     }
                 },
                 new Container
                 {
-                    Origin = Anchor.BottomRight,
-                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.CentreRight,
+                    Anchor = Anchor.CentreRight,
                     AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = progressContainer = new GrowToFitContainer
                     {
-                        timeLeft = new OsuSpriteText
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Child = timeLeft = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
                             Colour = colours.BlueLighter,
                             Font = OsuFont.Numeric,
-                            Margin = new MarginPadding
-                            {
-                                Right = margin,
-                            },
                         }
                     }
                 }
@@ -139,9 +148,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void keepTextSpritesUpright()
         {
-            timeCurrent.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
-            progress.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
-            timeLeft.OnUpdate += (timeCurrent) => { Extensions.DrawableExtensions.KeepUprightAndUnstretched(timeCurrent); };
+            timeCurrentContainer.OnUpdate += (timeCurrentContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(timeCurrentContainer); };
+            progressContainer.OnUpdate += (progressContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(progressContainer); };
+            timeLeftContainer.OnUpdate += (timeLeftContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(timeLeftContainer); };
         }
 
     }

From 0243f8d6ac0f97716f017468075c6a0ede2aa220 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 5 Aug 2022 14:28:15 +0100
Subject: [PATCH 050/709] Clean up

---
 osu.Game/Extensions/DrawableExtensions.cs          | 4 +---
 osu.Game/Graphics/Containers/GrowToFitContainer.cs | 1 -
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs      | 8 +++-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index fd5bbab567..f587b1c55b 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -81,7 +81,6 @@ namespace osu.Game.Extensions
             }
         }
 
-
         /// <summary>
         /// Keeps the drawable upright and prevents it from being scaled or flipped with its Parent.
         /// </summary>
@@ -90,7 +89,7 @@ namespace osu.Game.Extensions
         {
             var parentMatrix = drawable.Parent.DrawInfo.Matrix;
             float angle = MathF.Atan(parentMatrix.M12 / parentMatrix.M11);
-            angle *= (360 / (2 * MathF.PI));
+            angle = MathHelper.RadiansToDegrees(angle);
 
             parentMatrix.Transpose();
             parentMatrix.M13 = 0.0f;
@@ -117,7 +116,6 @@ namespace osu.Game.Extensions
 
             drawable.Scale = new Vector2(sx, sy);
             drawable.Shear = new Vector2(-alpha, -beta);
-
         }
     }
 }
diff --git a/osu.Game/Graphics/Containers/GrowToFitContainer.cs b/osu.Game/Graphics/Containers/GrowToFitContainer.cs
index 6333718928..9b4ad0dba9 100644
--- a/osu.Game/Graphics/Containers/GrowToFitContainer.cs
+++ b/osu.Game/Graphics/Containers/GrowToFitContainer.cs
@@ -18,5 +18,4 @@ namespace osu.Game.Graphics.Containers
             Width = Math.Max(Child.Width, Width);
         }
     }
-
 }
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 8c9f3aaa8d..34f773509a 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -5,7 +5,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -148,10 +147,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void keepTextSpritesUpright()
         {
-            timeCurrentContainer.OnUpdate += (timeCurrentContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(timeCurrentContainer); };
-            progressContainer.OnUpdate += (progressContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(progressContainer); };
-            timeLeftContainer.OnUpdate += (timeLeftContainer) => { Extensions.DrawableExtensions.KeepUprightAndUnscaled(timeLeftContainer); };
+            timeCurrentContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
+            progressContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
+            timeLeftContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
         }
-
     }
 }

From 24c29b7e2f5d6ec717a056db1149099c1632df46 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 5 Aug 2022 15:51:07 +0200
Subject: [PATCH 051/709] Do not add KPS calculation when gameplay rate is 0

---
 osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index f9839abde4..5ac3647e0e 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private void addTimestamp()
         {
-            if (workingClock != null && workingClock.CurrentTime >= maxTime)
+            if (workingClock != null && workingClock.CurrentTime >= maxTime && gameplayClock.TrueGameplayRate > 0)
             {
                 timestamps.Add(workingClock.CurrentTime);
                 maxTime = workingClock.CurrentTime;

From b4e0fa7c53cf3d1a8d580562c8301a6e70d4d2bc Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 5 Aug 2022 15:53:06 +0200
Subject: [PATCH 052/709] Rewrite tests for KPS

---
 .../Gameplay/TestSceneKeyPerSecondCounter.cs  |  91 --------------
 .../Gameplay/TestSceneKeysPerSecondCounter.cs | 114 ++++++++++--------
 2 files changed, 66 insertions(+), 139 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs
deleted file mode 100644
index a2eaea29eb..0000000000
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyPerSecondCounter.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// 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.
-
-#nullable disable
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Framework.Testing;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KPSCounter;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Gameplay
-{
-    public class TestSceneKeyPerSecondCounter : PlayerTestScene
-    {
-        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
-        protected override bool HasCustomSteps => false;
-        protected override bool Autoplay => true;
-
-        private GameplayClock gameplayClock;
-        private DrawableRuleset drawableRuleset;
-
-        // private DependencyProvidingContainer dependencyContainer;
-        private KeysPerSecondCounter counter;
-
-        [SetUpSteps]
-        public new void SetUpSteps()
-        {
-            /*
-            CreateTest(() => AddStep("Create components", () =>
-            {
-                Logger.Log($"{(Player != null ? Player.ToString() : "null")}", level: LogLevel.Debug);
-                dependencyContainer = new DependencyProvidingContainer
-                {
-                    RelativePositionAxes = Axes.Both,
-                };
-            }));
-        */
-        }
-
-        private void createCounter()
-        {
-            AddStep("Create counter", () =>
-            {
-                /*
-                if (!Contains(dependencyContainer))
-                {
-                    Add(dependencyContainer);
-                }
-
-                if (dependencyContainer.CachedDependencies.Length == 0)
-                {
-                    dependencyContainer.CachedDependencies = new (Type, object)[]
-                    {
-                        (typeof(GameplayClock), ,
-                        (typeof(DrawableRuleset),)
-                    };
-                }
-                Dependencies.Cache(gameplayClock = Player.GameplayClockContainer.GameplayClock));
-                */
-
-                Dependencies.Cache(gameplayClock = Player.GameplayClockContainer.GameplayClock);
-                Dependencies.Cache(drawableRuleset = Player.DrawableRuleset);
-
-                Add(counter = new KeysPerSecondCounter
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Scale = new Vector2(5),
-                        Position = new Vector2(10, 100)
-                    }
-                );
-            });
-            AddAssert("ensure counter added", () => Contains(counter));
-        }
-
-        [Test]
-        public void TestInGameTimeConsistency()
-        {
-            createCounter();
-
-            AddUntilStep("Wait until first note", () => counter.Current.Value != 0);
-            AddStep("Pause gameplay", () => gameplayClock.IsPaused.Value = true);
-            AddAssert("KPS = 1", () => counter.Current.Value == 1);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
index c8c31d1366..0cc9b91d71 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -3,9 +3,15 @@
 
 #nullable disable
 
+using System.Linq;
+using AutoMapper.Internal;
 using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD.KPSCounter;
 using osuTK;
@@ -13,63 +19,75 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneKeysPerSecondCounter : OsuManualInputManagerTestScene
+    public class TestSceneKeysPerSecondCounter : PlayerTestScene
     {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+        protected override bool HasCustomSteps => false;
+        protected override bool Autoplay => false;
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, false);
+
+        private GameplayClock gameplayClock;
+        private DrawableRuleset drawableRuleset;
+
         private KeysPerSecondCounter counter;
 
-        [SetUpSteps]
-        public void Setup()
+        private void createCounter()
+        {
+            AddStep("Create counter", () =>
+            {
+                gameplayClock = Player.GameplayClockContainer.GameplayClock;
+                drawableRuleset = Player.DrawableRuleset;
+
+                Player.HUDOverlay.Add(counter = new KeysPerSecondCounter
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(5),
+                });
+                counter.SmoothingTime.Value = 0;
+            });
+            AddUntilStep("Counter created", () => Player.HUDOverlay.Contains(counter));
+        }
+
+        [Test]
+        public void TestBasic()
         {
             createCounter();
-        }
 
-        private void createCounter() => AddStep("Create counter", () =>
-        {
-            Child = counter = new KeysPerSecondCounter
+            AddStep("press 1 key", () => InputManager.Key(Key.D));
+            AddAssert("KPS = 1", () => counter.Current.Value == 1);
+            AddUntilStep("Wait for KPS cooldown", () => counter.Current.Value <= 0);
+            AddStep("press 4 keys", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(5)
-            };
-        });
-
-        [Test]
-        public void TestManualTrigger()
-        {
-            AddAssert("Counter = 0", () => counter.Current.Value == 0);
-            AddRepeatStep("manual trigger", KeysPerSecondCalculator.AddInput, 20);
-            AddAssert("Counter is not 0", () => counter.Current.Value > 0);
-        }
-
-        [Test]
-        public void TestKpsAsideKeyCounter()
-        {
-            AddStep("Create key counter display", () =>
-                Add(new KeyCounterDisplay
+                InputManager.Key(Key.D);
+                InputManager.Key(Key.F);
+                InputManager.Key(Key.J);
+                InputManager.Key(Key.K);
+            });
+            AddAssert("KPS = 4", () => counter.Current.Value == 4);
+            AddStep("Pause player", () => Player.Pause());
+            AddAssert("KPS = 4", () => counter.Current.Value == 4);
+            AddStep("Resume player", () => Player.Resume());
+            AddStep("press 4 keys", () =>
+            {
+                InputManager.Key(Key.D);
+                InputManager.Key(Key.F);
+                InputManager.Key(Key.J);
+                InputManager.Key(Key.K);
+            });
+            AddAssert("KPS = 8", () => counter.Current.Value == 8);
+            AddUntilStep("Wait for KPS cooldown", () => counter.Current.Value <= 0);
+            AddStep("Add DT", () =>
+            {
+                var dt = new ManiaModDoubleTime
                 {
-                    Origin = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
-                    Y = 100,
-                    Children = new KeyCounter[]
+                    SpeedChange =
                     {
-                        new KeyCounterKeyboard(Key.W),
-                        new KeyCounterKeyboard(Key.X),
-                        new KeyCounterKeyboard(Key.C),
-                        new KeyCounterKeyboard(Key.V)
+                        Value = 2
                     }
-                })
-            );
-            AddAssert("Counter = 0", () => counter.Current.Value == 0);
-            addPressKeyStep(Key.W);
-            addPressKeyStep(Key.X);
-            addPressKeyStep(Key.C);
-            addPressKeyStep(Key.V);
-            AddAssert("Counter = 4", () => counter.Current.Value == 4);
-        }
-
-        private void addPressKeyStep(Key key)
-        {
-            AddStep($"Press {key} key", () => InputManager.Key(key));
+                };
+                Player.Mods.Value.Concat((dt.Yield()).ToArray());
+            });
         }
     }
 }

From b46bc5d65b9e4441bb3dc4509f4ff328317f22b6 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 5 Aug 2022 14:57:33 +0100
Subject: [PATCH 053/709] Remove empty line

---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 34f773509a..e9d0ffe4b9 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System;
 
-
 namespace osu.Game.Screens.Play.HUD
 {
     public class SongProgressInfo : Container

From 0c07df2c267c36fb1c5ac5cf4dae095b94d01521 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 5 Aug 2022 17:04:33 +0200
Subject: [PATCH 054/709] Remove DT from KPS test

---
 .../Gameplay/TestSceneKeysPerSecondCounter.cs    | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
index 0cc9b91d71..6e59c53a1f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -3,14 +3,10 @@
 
 #nullable disable
 
-using System.Linq;
-using AutoMapper.Internal;
 using NUnit.Framework;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD.KPSCounter;
@@ -76,18 +72,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 InputManager.Key(Key.K);
             });
             AddAssert("KPS = 8", () => counter.Current.Value == 8);
-            AddUntilStep("Wait for KPS cooldown", () => counter.Current.Value <= 0);
-            AddStep("Add DT", () =>
-            {
-                var dt = new ManiaModDoubleTime
-                {
-                    SpeedChange =
-                    {
-                        Value = 2
-                    }
-                };
-                Player.Mods.Value.Concat((dt.Yield()).ToArray());
-            });
         }
     }
 }

From 0886137e39b965571143387cd44b516b185fd189 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 5 Aug 2022 16:31:20 +0200
Subject: [PATCH 055/709] Prevent KeysPerSecondCounter from NRE when no
 instance is initialized

---
 .../Play/HUD/KPSCounter/KeysPerSecondCalculator.cs        | 8 ++++----
 osu.Game/Screens/Play/Player.cs                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index 5ac3647e0e..a29f4c9706 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         public static void AddInput()
         {
-            instance?.onNewInput.Invoke();
+            instance?.onNewInput?.Invoke();
         }
 
         public static KeysPerSecondCalculator GetInstance(GameplayClock gameplayClock = null, DrawableRuleset drawableRuleset = null)
@@ -41,9 +41,9 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private event Action onNewInput;
 
-        private IClock workingClock => (IClock)drawableRuleset.FrameStableClock ?? gameplayClock;
+        private IClock workingClock => (IClock)drawableRuleset?.FrameStableClock ?? gameplayClock;
 
-        // Having the rate from mods is preffered to using GameplayClock.TrueGameplayRate()
+        // Having the rate from mods is preferred to using GameplayClock.TrueGameplayRate()
         // as it returns 0 when paused in replays, not useful for players who want to "analyze" a replay.
         private double rate => (drawableRuleset.Mods.FirstOrDefault(m => m is ModRateAdjust) as ModRateAdjust)?.SpeedChange.Value
                                ?? 1;
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private void addTimestamp()
         {
-            if (workingClock != null && workingClock.CurrentTime >= maxTime && gameplayClock.TrueGameplayRate > 0)
+            if (Ready && workingClock.CurrentTime >= maxTime && gameplayClock.TrueGameplayRate > 0)
             {
                 timestamps.Add(workingClock.CurrentTime);
                 maxTime = workingClock.CurrentTime;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88cd197076..70b1dc9a41 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -1046,7 +1046,7 @@ namespace osu.Game.Screens.Play
 
             fadeOut();
 
-            KeysPerSecondCalculator.GetInstance().Dispose();
+            KeysPerSecondCalculator.GetInstance()?.Dispose();
 
             return base.OnExiting(e);
         }

From b2557a8d2d4ca1ecde0cc6b709085df912316ede Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 7 Aug 2022 00:53:00 +0200
Subject: [PATCH 056/709] Refactor KPS

- Remove '#nullable disable' in KeysPerSecondCalculator and
  KeysPerSecondCounter
- Remove KeysPerSecondCalculator IDisposable implementation
- Make KeysPerSecondCalculator static instance initialized once by
  KeysPerSecondCounters
- Auto transfer dependencies from KeysPerSecondCounter to
  KeysPerSecondCalculator using Resolved properties
- Add internal reset logic to KeysPerSecondCalculator and make it
  independent from Player
- Use GameplayClock.TrueGameplayRate to get real-time rate. If 0 then it
  defaults to the last non 0 rate if no such mod is enabled
---
 .../HUD/KPSCounter/KeysPerSecondCalculator.cs | 106 +++++++++++-------
 .../HUD/KPSCounter/KeysPerSecondCounter.cs    |  33 +++---
 osu.Game/Screens/Play/Player.cs               |   3 -
 3 files changed, 81 insertions(+), 61 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index a29f4c9706..3c0d585984 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,59 +10,93 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.KPSCounter
 {
-    public class KeysPerSecondCalculator : IDisposable
+    public class KeysPerSecondCalculator
     {
-        private static KeysPerSecondCalculator instance;
-
         public static void AddInput()
         {
-            instance?.onNewInput?.Invoke();
-        }
-
-        public static KeysPerSecondCalculator GetInstance(GameplayClock gameplayClock = null, DrawableRuleset drawableRuleset = null)
-        {
-            if (instance != null) return instance;
-
-            try
-            {
-                return new KeysPerSecondCalculator(gameplayClock, drawableRuleset);
-            }
-            catch (ArgumentNullException)
-            {
-                return null;
-            }
+            onNewInput?.Invoke();
         }
 
         private readonly List<double> timestamps;
-        private readonly GameplayClock gameplayClock;
-        private readonly DrawableRuleset drawableRuleset;
+        private GameplayClock? gameplayClock;
+        private DrawableRuleset? drawableRuleset;
 
-        private event Action onNewInput;
+        public GameplayClock? GameplayClock
+        {
+            get => gameplayClock;
+            set
+            {
+                onResetRequested?.Invoke();
 
-        private IClock workingClock => (IClock)drawableRuleset?.FrameStableClock ?? gameplayClock;
+                if (value != null)
+                {
+                    gameplayClock = value;
+                }
+            }
+        }
 
-        // Having the rate from mods is preferred to using GameplayClock.TrueGameplayRate()
-        // as it returns 0 when paused in replays, not useful for players who want to "analyze" a replay.
-        private double rate => (drawableRuleset.Mods.FirstOrDefault(m => m is ModRateAdjust) as ModRateAdjust)?.SpeedChange.Value
+        public DrawableRuleset? DrawableRuleset
+        {
+            get => drawableRuleset;
+            set
+            {
+                onResetRequested?.Invoke();
+
+                if (value != null)
+                {
+                    drawableRuleset = value;
+                    baseRate = (drawableRuleset.Mods.FirstOrDefault(m => m is ModRateAdjust) as ModRateAdjust)?.SpeedChange.Value
                                ?? 1;
+                }
+            }
+        }
+
+        private static event Action? onNewInput;
+        private static event Action? onResetRequested;
+
+        private IClock? workingClock => drawableRuleset?.FrameStableClock;
+
+        private double baseRate;
+
+        private double rate
+        {
+            get
+            {
+                if (gameplayClock != null)
+                {
+                    if (gameplayClock.TrueGameplayRate > 0)
+                    {
+                        baseRate = gameplayClock.TrueGameplayRate;
+                    }
+                }
+
+                return baseRate;
+            }
+        }
 
         private double maxTime = double.NegativeInfinity;
 
         public bool Ready => workingClock != null && gameplayClock != null;
         public int Value => timestamps.Count(isTimestampWithinSpan);
 
-        private KeysPerSecondCalculator(GameplayClock gameplayClock, DrawableRuleset drawableRuleset)
+        public KeysPerSecondCalculator()
         {
-            instance = this;
             timestamps = new List<double>();
-            this.gameplayClock = gameplayClock ?? throw new ArgumentNullException(nameof(gameplayClock));
-            this.drawableRuleset = drawableRuleset;
             onNewInput += addTimestamp;
+            onResetRequested += cleanUp;
+        }
+
+        private void cleanUp()
+        {
+            timestamps.Clear();
+            maxTime = double.NegativeInfinity;
         }
 
         private void addTimestamp()
         {
-            if (Ready && workingClock.CurrentTime >= maxTime && gameplayClock.TrueGameplayRate > 0)
+            if (workingClock == null) return;
+
+            if (workingClock.CurrentTime >= maxTime)
             {
                 timestamps.Add(workingClock.CurrentTime);
                 maxTime = workingClock.CurrentTime;
@@ -73,19 +105,11 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private bool isTimestampWithinSpan(double timestamp)
         {
-            if (!Ready)
-                return false;
+            if (workingClock == null) return false;
 
             double span = 1000 * rate;
             double relativeTime = workingClock.CurrentTime - timestamp;
             return relativeTime >= 0 && relativeTime <= span;
         }
-
-        public void Dispose()
-        {
-            instance = null;
-        }
-
-        ~KeysPerSecondCalculator() => Dispose();
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
index 2fcca2ffce..ad7b6c8f5c 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
@@ -1,15 +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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -24,21 +21,24 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
         private const float alpha_when_invalid = 0.3f;
 
         private readonly Bindable<bool> valid = new Bindable<bool>();
-        private GameplayClock gameplayClock;
+
+        private static readonly KeysPerSecondCalculator calculator = new KeysPerSecondCalculator();
+
+        [Resolved]
+        private GameplayClock? gameplayClock
+        {
+            get => calculator.GameplayClock;
+            set => calculator.GameplayClock = value;
+        }
 
         [Resolved(canBeNull: true)]
-        private DrawableRuleset drawableRuleset { get; set; }
-
-        private KeysPerSecondCalculator calculator => KeysPerSecondCalculator.GetInstance(gameplayClock, drawableRuleset);
-
-        [SettingSource("Smoothing time", "How smooth the counter should change\nThe more it is smooth, the less it's accurate.")]
-        public BindableNumber<double> SmoothingTime { get; } = new BindableNumber<double>(350)
+        private DrawableRuleset? drawableRuleset
         {
-            MaxValue = 1000,
-            MinValue = 0
-        };
+            get => calculator.DrawableRuleset;
+            set => calculator.DrawableRuleset = value;
+        }
 
-        protected override double RollingDuration => SmoothingTime.Value;
+        protected override double RollingDuration => 350;
 
         public bool UsesFixedAnchor { get; set; }
 
@@ -48,9 +48,8 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameplayClock clock, DrawableRuleset ruleset)
+        private void load(OsuColour colours)
         {
-            gameplayClock = clock;
             Colour = colours.BlueLighter;
             valid.BindValueChanged(e =>
                 DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));
@@ -61,7 +60,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
             base.Update();
 
             valid.Value = calculator.Ready;
-            Current.Value = calculator.Value;
+            Current.Value = calculator.Ready ? calculator.Value : 0;
         }
 
         protected override IHasText CreateText() => new TextComponent
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 70b1dc9a41..e3844088e2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,7 +34,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Screens.Play.HUD.KPSCounter;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -1046,8 +1045,6 @@ namespace osu.Game.Screens.Play
 
             fadeOut();
 
-            KeysPerSecondCalculator.GetInstance()?.Dispose();
-
             return base.OnExiting(e);
         }
 

From 0bfa6fa975e5bb3e0510b2c71d9e62416f17bbf2 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sun, 7 Aug 2022 13:18:29 +0100
Subject: [PATCH 057/709] Implement UprightUnscaledContainer

---
 .../Graphics/Containers/UprightContainer.cs   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/UprightContainer.cs

diff --git a/osu.Game/Graphics/Containers/UprightContainer.cs b/osu.Game/Graphics/Containers/UprightContainer.cs
new file mode 100644
index 0000000000..21035e82b9
--- /dev/null
+++ b/osu.Game/Graphics/Containers/UprightContainer.cs
@@ -0,0 +1,32 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
+
+namespace osu.Game.Graphics.Containers
+{
+    /// <summary>
+    /// A container that prevents itself and its children from getting rotated, scaled or flipped with its Parent.
+    /// </summary>
+    public class UprightUnscaledContainer : Container
+    {
+        public UprightUnscaledContainer()
+        {
+            AddLayout(layout);
+        }
+
+        private LayoutValue layout = new LayoutValue(Invalidation.DrawInfo);
+
+        protected override void Update()
+        {
+            base.Update();
+            if (!layout.IsValid)
+            {
+                Extensions.DrawableExtensions.KeepUprightAndUnscaled(this);
+                layout.Validate();
+            }
+        }
+    }
+}

From ed86255e2b45f7e658b9a47975044652902df107 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sun, 7 Aug 2022 13:20:22 +0100
Subject: [PATCH 058/709] Use UprightUnscaledContainer instead of
 KeepUprightAndUnscaled

---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index e9d0ffe4b9..069492fd80 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -15,10 +15,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class SongProgressInfo : Container
     {
-        private GrowToFitContainer timeCurrentContainer;
-        private GrowToFitContainer timeLeftContainer;
-        private GrowToFitContainer progressContainer;
-
         private OsuSpriteText timeCurrent;
         private OsuSpriteText timeLeft;
         private OsuSpriteText progress;
@@ -59,16 +55,22 @@ namespace osu.Game.Screens.Play.HUD
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     AutoSizeAxes = Axes.Both,
-                    Child = timeCurrentContainer = new GrowToFitContainer
+                    Child = new UprightUnscaledContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Child = timeCurrent = new OsuSpriteText
+                        AutoSizeAxes = Axes.Both,
+                        Child = new GrowToFitContainer
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Colour = colours.BlueLighter,
-                            Font = OsuFont.Numeric,
+                            Child = timeCurrent = new OsuSpriteText
+                            {
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                Colour = colours.BlueLighter,
+                                Font = OsuFont.Numeric,
+                            }
                         }
                     }
                 },
@@ -77,17 +79,23 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
-                    Child = timeLeftContainer = new GrowToFitContainer
+                    Child = new UprightUnscaledContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Child = progress = new OsuSpriteText
+                        AutoSizeAxes = Axes.Both,
+                        Child = new GrowToFitContainer
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Colour = colours.BlueLighter,
-                            Font = OsuFont.Numeric,
-                         }
+                            Child = progress = new OsuSpriteText
+                            {
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                Colour = colours.BlueLighter,
+                                Font = OsuFont.Numeric,
+                             }
+                        }
                     }
                 },
                 new Container
@@ -95,28 +103,28 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
                     AutoSizeAxes = Axes.Both,
-                    Child = progressContainer = new GrowToFitContainer
+                    Child = new UprightUnscaledContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Child = timeLeft = new OsuSpriteText
+                        AutoSizeAxes = Axes.Both,
+                        Child = new GrowToFitContainer
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Colour = colours.BlueLighter,
-                            Font = OsuFont.Numeric,
+                            Child = timeLeft = new OsuSpriteText
+                            {
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                Colour = colours.BlueLighter,
+                                Font = OsuFont.Numeric,
+                            }
                         }
                     }
                 }
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            keepTextSpritesUpright();
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -143,12 +151,5 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         private string formatTime(TimeSpan timeSpan) => $"{(timeSpan < TimeSpan.Zero ? "-" : "")}{Math.Floor(timeSpan.Duration().TotalMinutes)}:{timeSpan.Duration().Seconds:D2}";
-
-        private void keepTextSpritesUpright()
-        {
-            timeCurrentContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
-            progressContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
-            timeLeftContainer.OnUpdate += Extensions.DrawableExtensions.KeepUprightAndUnscaled;
-        }
     }
 }

From cfd07cb366bb007b3936bc387eebd37857de1f9f Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sun, 7 Aug 2022 15:04:11 +0100
Subject: [PATCH 059/709] Set InvalidationSource to parent and clean up

---
 .../{UprightContainer.cs => UprightUnscaledContainer.cs}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game/Graphics/Containers/{UprightContainer.cs => UprightUnscaledContainer.cs} (95%)

diff --git a/osu.Game/Graphics/Containers/UprightContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
similarity index 95%
rename from osu.Game/Graphics/Containers/UprightContainer.cs
rename to osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index 21035e82b9..cdb839fdec 100644
--- a/osu.Game/Graphics/Containers/UprightContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.Containers
             AddLayout(layout);
         }
 
-        private LayoutValue layout = new LayoutValue(Invalidation.DrawInfo);
+        private LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
 
         protected override void Update()
         {

From b52a07c16a6559b3661453f533783ae9abeb7a69 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Mon, 8 Aug 2022 21:27:46 +0200
Subject: [PATCH 060/709] Use DI to provide dependencies for KPS Calculator and
 improve input gathering

KPS Calculator now uses DI to retrieve the clocks. Using `HUDOverlay` it
is now cached for `KeysPerSecondCounter`s to resolve it. This also
allows to make an "Attach" flow like `KeyCounter`.
---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       |  5 +-
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 37 +++++++++-
 .../HUD/KPSCounter/KeysPerSecondCalculator.cs | 70 +++++++++----------
 .../HUD/KPSCounter/KeysPerSecondCounter.cs    | 22 +++---
 osu.Game/Screens/Play/HUDOverlay.cs           |  8 ++-
 osu.Game/Screens/Play/KeyCounter.cs           |  2 -
 6 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index f7f62d2af0..b28e3355a4 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -30,6 +30,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -38,7 +39,7 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject contained by this DrawableRuleset.</typeparam>
-    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter
+    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter, ICanAttachKpsCalculator
         where TObject : HitObject
     {
         public override event Action<JudgementResult> NewResult;
@@ -340,6 +341,8 @@ namespace osu.Game.Rulesets.UI
         public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
 
+        public void Attach(KeysPerSecondCalculator kps) => (KeyBindingInputManager as ICanAttachKpsCalculator)?.Attach(kps);
+
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
         /// </summary>
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7c37913576..23e64153eb 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -20,11 +20,12 @@ using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
+    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler, ICanAttachKpsCalculator
         where T : struct
     {
         public readonly KeyBindingContainer<T> KeyBindingContainer;
@@ -186,6 +187,35 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        #region KPS Counter Attachment
+
+        public void Attach(KeysPerSecondCalculator kps)
+        {
+            var listener = new ActionListener();
+
+            KeyBindingContainer.Add(listener);
+
+            kps.Listener = listener;
+        }
+
+        public class ActionListener : KeysPerSecondCalculator.InputListener, IKeyBindingHandler<T>
+        {
+            public override event Action OnNewInput;
+
+            public bool OnPressed(KeyBindingPressEvent<T> e)
+            {
+                OnNewInput?.Invoke();
+
+                return false;
+            }
+
+            public void OnReleased(KeyBindingReleaseEvent<T> e)
+            {
+            }
+        }
+
+        #endregion
+
         protected virtual KeyBindingContainer<T> CreateKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
             => new RulesetKeyBindingContainer(ruleset, variant, unique);
 
@@ -229,6 +259,11 @@ namespace osu.Game.Rulesets.UI
         void Attach(KeyCounterDisplay keyCounter);
     }
 
+    public interface ICanAttachKpsCalculator
+    {
+        void Attach(KeysPerSecondCalculator keysPerSecondCalculator);
+    }
+
     public class RulesetInputManagerInputState<T> : InputState
         where T : struct
     {
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index 3c0d585984..96a6d5b8eb 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -4,55 +4,36 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Timing;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.KPSCounter
 {
-    public class KeysPerSecondCalculator
+    public class KeysPerSecondCalculator : Component
     {
-        public static void AddInput()
-        {
-            onNewInput?.Invoke();
-        }
-
         private readonly List<double> timestamps;
-        private GameplayClock? gameplayClock;
-        private DrawableRuleset? drawableRuleset;
 
-        public GameplayClock? GameplayClock
+        private InputListener? listener;
+
+        [Resolved]
+        private GameplayClock? gameplayClock { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private DrawableRuleset? drawableRuleset { get; set; }
+
+        public InputListener Listener
         {
-            get => gameplayClock;
             set
             {
                 onResetRequested?.Invoke();
-
-                if (value != null)
-                {
-                    gameplayClock = value;
-                }
+                listener = value;
+                listener.OnNewInput += addTimestamp;
             }
         }
 
-        public DrawableRuleset? DrawableRuleset
-        {
-            get => drawableRuleset;
-            set
-            {
-                onResetRequested?.Invoke();
-
-                if (value != null)
-                {
-                    drawableRuleset = value;
-                    baseRate = (drawableRuleset.Mods.FirstOrDefault(m => m is ModRateAdjust) as ModRateAdjust)?.SpeedChange.Value
-                               ?? 1;
-                }
-            }
-        }
-
-        private static event Action? onNewInput;
-        private static event Action? onResetRequested;
+        private event Action? onResetRequested;
 
         private IClock? workingClock => drawableRuleset?.FrameStableClock;
 
@@ -81,8 +62,8 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         public KeysPerSecondCalculator()
         {
+            RelativeSizeAxes = Axes.Both;
             timestamps = new List<double>();
-            onNewInput += addTimestamp;
             onResetRequested += cleanUp;
         }
 
@@ -90,6 +71,9 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
         {
             timestamps.Clear();
             maxTime = double.NegativeInfinity;
+
+            if (listener != null)
+                listener.OnNewInput -= addTimestamp;
         }
 
         private void addTimestamp()
@@ -111,5 +95,21 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
             double relativeTime = workingClock.CurrentTime - timestamp;
             return relativeTime >= 0 && relativeTime <= span;
         }
+
+        ~KeysPerSecondCalculator()
+        {
+            cleanUp();
+        }
+
+        public abstract class InputListener : Component
+        {
+            protected InputListener()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Depth = float.MinValue;
+            }
+
+            public abstract event Action? OnNewInput;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
index ad7b6c8f5c..d6f1d19770 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
@@ -22,21 +22,15 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private readonly Bindable<bool> valid = new Bindable<bool>();
 
-        private static readonly KeysPerSecondCalculator calculator = new KeysPerSecondCalculator();
-
         [Resolved]
-        private GameplayClock? gameplayClock
-        {
-            get => calculator.GameplayClock;
-            set => calculator.GameplayClock = value;
-        }
+        private KeysPerSecondCalculator? calculator { get; set; }
+
+        // This is to force the skin editor to show the component only in a Gameplay context
+        [Resolved]
+        private GameplayClock? gameplayClock { get; set; }
 
         [Resolved(canBeNull: true)]
-        private DrawableRuleset? drawableRuleset
-        {
-            get => calculator.DrawableRuleset;
-            set => calculator.DrawableRuleset = value;
-        }
+        private DrawableRuleset? drawableRuleset { get; set; }
 
         protected override double RollingDuration => 350;
 
@@ -59,8 +53,8 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
         {
             base.Update();
 
-            valid.Value = calculator.Ready;
-            Current.Value = calculator.Ready ? calculator.Value : 0;
+            valid.Value = calculator != null && calculator.Ready;
+            Current.Value = calculator != null ? calculator.Ready ? calculator.Value : 0 : 0;
         }
 
         protected override IHasText CreateText() => new TextComponent
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 8f80644d52..1c28e04950 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.KPSCounter;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -49,6 +50,9 @@ namespace osu.Game.Screens.Play
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
+        [Cached]
+        private readonly KeysPerSecondCalculator keysPerSecondCalculator;
+
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
         private readonly DrawableRuleset drawableRuleset;
@@ -122,7 +126,8 @@ namespace osu.Game.Screens.Play
                         KeyCounter = CreateKeyCounter(),
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
-                }
+                },
+                keysPerSecondCalculator = new KeysPerSecondCalculator()
             };
         }
 
@@ -260,6 +265,7 @@ namespace osu.Game.Screens.Play
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
             (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
+            (drawableRuleset as ICanAttachKpsCalculator)?.Attach(keysPerSecondCalculator);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index 044c9ee24e..1e5ada5295 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play.HUD.KPSCounter;
 using osuTK;
 using osuTK.Graphics;
 
@@ -56,7 +55,6 @@ namespace osu.Game.Screens.Play
 
         public void Increment()
         {
-            KeysPerSecondCalculator.AddInput();
             if (!IsCounting)
                 return;
 

From edb8e5e33e3649f0be60e8b4a53498ab200076a4 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Tue, 9 Aug 2022 02:43:41 +0200
Subject: [PATCH 061/709] Temporarily emptying `TestSceneKeysPerSecondCounter`
 until a good test can be found

---
 .../Gameplay/TestSceneKeysPerSecondCounter.cs | 70 +------------------
 1 file changed, 1 insertion(+), 69 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
index 6e59c53a1f..8bc2eae1d4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
@@ -1,77 +1,9 @@
 // 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.
 
-#nullable disable
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KPSCounter;
-using osuTK;
-using osuTK.Input;
-
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneKeysPerSecondCounter : PlayerTestScene
+    public class TestSceneKeysPerSecondCounter : OsuManualInputManagerTestScene
     {
-        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
-        protected override bool HasCustomSteps => false;
-        protected override bool Autoplay => false;
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, false);
-
-        private GameplayClock gameplayClock;
-        private DrawableRuleset drawableRuleset;
-
-        private KeysPerSecondCounter counter;
-
-        private void createCounter()
-        {
-            AddStep("Create counter", () =>
-            {
-                gameplayClock = Player.GameplayClockContainer.GameplayClock;
-                drawableRuleset = Player.DrawableRuleset;
-
-                Player.HUDOverlay.Add(counter = new KeysPerSecondCounter
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(5),
-                });
-                counter.SmoothingTime.Value = 0;
-            });
-            AddUntilStep("Counter created", () => Player.HUDOverlay.Contains(counter));
-        }
-
-        [Test]
-        public void TestBasic()
-        {
-            createCounter();
-
-            AddStep("press 1 key", () => InputManager.Key(Key.D));
-            AddAssert("KPS = 1", () => counter.Current.Value == 1);
-            AddUntilStep("Wait for KPS cooldown", () => counter.Current.Value <= 0);
-            AddStep("press 4 keys", () =>
-            {
-                InputManager.Key(Key.D);
-                InputManager.Key(Key.F);
-                InputManager.Key(Key.J);
-                InputManager.Key(Key.K);
-            });
-            AddAssert("KPS = 4", () => counter.Current.Value == 4);
-            AddStep("Pause player", () => Player.Pause());
-            AddAssert("KPS = 4", () => counter.Current.Value == 4);
-            AddStep("Resume player", () => Player.Resume());
-            AddStep("press 4 keys", () =>
-            {
-                InputManager.Key(Key.D);
-                InputManager.Key(Key.F);
-                InputManager.Key(Key.J);
-                InputManager.Key(Key.K);
-            });
-            AddAssert("KPS = 8", () => counter.Current.Value == 8);
-        }
     }
 }

From 2367dc96107091207c468738a93f6ece62310f05 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Tue, 9 Aug 2022 13:06:11 +0100
Subject: [PATCH 062/709] Improved KeepUprightAndUnscaled

---
 osu.Game/Extensions/DrawableExtensions.cs | 36 +++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index f587b1c55b..320b9d7996 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -82,40 +82,38 @@ namespace osu.Game.Extensions
         }
 
         /// <summary>
-        /// Keeps the drawable upright and prevents it from being scaled or flipped with its Parent.
+        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
         /// </summary>
         /// <param name="drawable">The drawable.</param>
         public static void KeepUprightAndUnscaled(this Drawable drawable)
         {
+            // Decomposes the inverse of the parent FrawInfo.Matrix into rotation, shear and scale.
             var parentMatrix = drawable.Parent.DrawInfo.Matrix;
-            float angle = MathF.Atan(parentMatrix.M12 / parentMatrix.M11);
-            angle = MathHelper.RadiansToDegrees(angle);
-
             parentMatrix.Transpose();
+
+            // Remove Translation.
             parentMatrix.M13 = 0.0f;
             parentMatrix.M23 = 0.0f;
 
-            if ((Math.Abs(Math.Abs(angle) - 90.0)) < 2.0f)
-            {
-                Matrix3 m = Matrix3.CreateRotationZ(MathHelper.DegreesToRadians(40.0f));
-                m.Transpose();
-                parentMatrix *= m;
-                drawable.Rotation = 40.0f;
-            }
-            else
-                drawable.Rotation = 0.0f;
-
             Matrix3 C = parentMatrix.Inverted();
 
-            float alpha, beta, sx, sy;
+            // Extract the rotation.
+            float angle = MathF.Atan2(C.M21, C.M11);
+            drawable.Rotation = MathHelper.RadiansToDegrees(angle);
+
+            // Remove rotation from the C matrix so that it only contains shear and scale.
+            Matrix3 m = Matrix3.CreateRotationZ(-angle);
+            m.Transpose();
+            C = m * C;
+
+            // Extract shear and scale.
+            float alpha, sx, sy;
+            sx = C.M11;
             sy = C.M22;
             alpha = C.M12 / C.M22;
 
-            beta = (C.M21 == 0.0f) ? 0.0f : 1 / ((C.M11 / C.M21) - alpha);
-            sx = (beta == 0.0f) ? C.M11 : C.M21 / beta;
-
             drawable.Scale = new Vector2(sx, sy);
-            drawable.Shear = new Vector2(-alpha, -beta);
+            drawable.Shear = new Vector2(-alpha, 0);
         }
     }
 }

From 9e80d3f71c01a2e5789348a9237bc1d92c4b6c2b Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 00:42:22 +0200
Subject: [PATCH 063/709] Re-adjust timespan conditions in
 `KeysPerSecondCalculator`

---
 osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index 96a6d5b8eb..890404a0aa 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
             double span = 1000 * rate;
             double relativeTime = workingClock.CurrentTime - timestamp;
-            return relativeTime >= 0 && relativeTime <= span;
+            return relativeTime > 0 && relativeTime <= span;
         }
 
         ~KeysPerSecondCalculator()

From 46e372cb99ba47a86f17418353086e95a4ddd3fd Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 00:43:15 +0200
Subject: [PATCH 064/709] Add more readiness checks in
 `KeysPerSecondCalculator`

---
 osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
index 890404a0aa..dddef9abaf 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private double maxTime = double.NegativeInfinity;
 
-        public bool Ready => workingClock != null && gameplayClock != null;
+        public bool Ready => workingClock != null && gameplayClock != null && listener != null;
         public int Value => timestamps.Count(isTimestampWithinSpan);
 
         public KeysPerSecondCalculator()

From 0a94fb4039df50a5a48e55cae546221557fcff4d Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 00:46:31 +0200
Subject: [PATCH 065/709] Make KPS counter strictly depending only on KPS
 calculator

`KeysPerSecondCounter` now depends on `KeysPerSecondCalculator` via the
`BackgroundDependencyLoaderAttribute` method, making it appear only in a
gameplay context without requiring `GameplayClock` without using it.
---
 .../Play/HUD/KPSCounter/KeysPerSecondCounter.cs   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
index d6f1d19770..47ebede623 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
@@ -10,7 +10,7 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.UI;
+// using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -22,15 +22,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
 
         private readonly Bindable<bool> valid = new Bindable<bool>();
 
-        [Resolved]
-        private KeysPerSecondCalculator? calculator { get; set; }
-
-        // This is to force the skin editor to show the component only in a Gameplay context
-        [Resolved]
-        private GameplayClock? gameplayClock { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private DrawableRuleset? drawableRuleset { get; set; }
+        private KeysPerSecondCalculator? calculator;
 
         protected override double RollingDuration => 350;
 
@@ -42,8 +34,9 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, KeysPerSecondCalculator calculator)
         {
+            this.calculator = calculator;
             Colour = colours.BlueLighter;
             valid.BindValueChanged(e =>
                 DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));

From d58d5eebe2ec52e19142442dcdfd162d6263f213 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 00:51:13 +0200
Subject: [PATCH 066/709] Add basic tests for KPS

Created private mock classes to use them in place of `GameplayClock` and
`DrawableRuleset`.
---
 .../Visual/Gameplay/TestSceneKeysPerSecond.cs | 306 ++++++++++++++++++
 .../Gameplay/TestSceneKeysPerSecondCounter.cs |   9 -
 2 files changed, 306 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
 delete mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
new file mode 100644
index 0000000000..4bda998c49
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
@@ -0,0 +1,306 @@
+// 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.Diagnostics;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD.KPSCounter;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneKeysPerSecond : OsuTestScene
+    {
+        private DependencyProvidingContainer? dependencyContainer;
+        private MockFrameStableClock? mainClock;
+        private KeysPerSecondCalculator? calculator;
+        private ManualInputListener? listener;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create components", () =>
+            {
+                var ruleset = CreateRuleset();
+
+                Debug.Assert(ruleset != null);
+
+                Children = new Drawable[]
+                {
+                    dependencyContainer = new DependencyProvidingContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        CachedDependencies = new (Type, object)[]
+                        {
+                            (typeof(GameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
+                            (typeof(DrawableRuleset), new DrawableCookieziRuleset(ruleset, mainClock))
+                        }
+                    },
+                };
+            });
+        }
+
+        private void createCalculator()
+        {
+            AddStep("create calculator", () =>
+            {
+                dependencyContainer!.Children = new Drawable[]
+                {
+                    calculator = new KeysPerSecondCalculator
+                    {
+                        Listener = listener = new ManualInputListener()
+                    },
+                    new DependencyProvidingContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        CachedDependencies = new (Type, object)[] { (typeof(KeysPerSecondCalculator), calculator) },
+                        Child = new KeysPerSecondCounter // For visual debugging, has no real purpose in the tests
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(5),
+                        }
+                    }
+                };
+            });
+        }
+
+        [Test]
+        public void TestBasicConsistency()
+        {
+            createCalculator();
+
+            AddStep("Create gradually increasing KPS inputs", () =>
+            {
+                addInputs(generateGraduallyIncreasingKps());
+            });
+
+            for (int i = 0; i < 10; i++)
+            {
+                seek(i * 10000);
+                advanceForwards(2);
+                int kps = i + 1;
+                AddAssert($"{kps} KPS", () => calculator!.Value == kps);
+            }
+        }
+
+        [Test]
+        public void TestRateAdjustConsistency()
+        {
+            createCalculator();
+
+            AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
+
+            advanceForwards(2);
+
+            for (double i = 1; i <= 2; i += 0.25)
+            {
+                changeRate(i);
+                double rate = i;
+                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator!.Value, 10 * rate, 0.5));
+            }
+
+            for (double i = 1; i >= 0.5; i -= 0.25)
+            {
+                changeRate(i);
+                double rate = i;
+                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator!.Value, 10 * rate, 0.5));
+            }
+        }
+
+        [Test]
+        public void TestInputsDiscardedOnRewind()
+        {
+            createCalculator();
+
+            AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
+            seek(1000);
+
+            AddAssert("KPS = 10", () => calculator!.Value == 10);
+
+            AddStep("Create delayed inputs", () => addInputs(generateConsistentKps(10, 50)));
+            seek(1000);
+            AddAssert("KPS didn't changed", () => calculator!.Value == 10);
+        }
+
+        private void seek(double time) => AddStep($"Seek main clock to {time}ms", () => mainClock?.Seek(time));
+
+        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () =>
+            (mainClock?.UnderlyingClock as MockFrameBasedClock)!.Rate = rate);
+
+        private void advanceForwards(int frames = 1) => AddStep($"Advance main clock {frames} frame(s) forward.", () =>
+        {
+            if (mainClock == null) return;
+
+            MockFrameBasedClock underlyingClock = (MockFrameBasedClock)mainClock.UnderlyingClock;
+            underlyingClock.Backwards = false;
+
+            for (int i = 0; i < frames; i++)
+            {
+                underlyingClock.ProcessFrame();
+            }
+        });
+
+        private void addInputs(IEnumerable<double> inputs)
+        {
+            Debug.Assert(mainClock != null && listener != null);
+            if (!inputs.Any()) return;
+
+            double baseTime = mainClock.CurrentTime;
+
+            foreach (double timestamp in inputs)
+            {
+                mainClock.Seek(timestamp);
+                listener.AddInput();
+            }
+
+            mainClock.Seek(baseTime);
+        }
+
+        private IEnumerable<double> generateGraduallyIncreasingKps()
+        {
+            IEnumerable<double>? final = null;
+
+            for (int i = 1; i <= 10; i++)
+            {
+                var currentKps = generateConsistentKps(i, (i - 1) * 10000);
+
+                if (i == 1)
+                {
+                    final = currentKps;
+                    continue;
+                }
+
+                final = final!.Concat(currentKps);
+            }
+
+            return final!;
+        }
+
+        private IEnumerable<double> generateConsistentKps(double kps, double start = 0, double duration = 10)
+        {
+            double end = start + 1000 * duration;
+
+            for (; start < end; start += 1000 / kps)
+            {
+                yield return start;
+            }
+        }
+
+        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+
+        #region Mock classes
+
+        private class ManualInputListener : KeysPerSecondCalculator.InputListener
+        {
+            public override event Action? OnNewInput;
+
+            public void AddInput() => OnNewInput?.Invoke();
+        }
+
+        private class MockFrameBasedClock : ManualClock, IFrameBasedClock
+        {
+            public const double FRAME_INTERVAL = 1000;
+            public bool Backwards;
+
+            public MockFrameBasedClock()
+            {
+                Rate = 1;
+                IsRunning = true;
+            }
+
+            public void ProcessFrame()
+            {
+                CurrentTime += FRAME_INTERVAL * Rate * (Backwards ? -1 : 1);
+                TimeInfo = new FrameTimeInfo
+                {
+                    Current = CurrentTime,
+                    Elapsed = FRAME_INTERVAL * Rate * (Backwards ? -1 : 1)
+                };
+            }
+
+            public void Seek(double time)
+            {
+                TimeInfo = new FrameTimeInfo
+                {
+                    Elapsed = time - CurrentTime,
+                    Current = CurrentTime = time
+                };
+            }
+
+            public double ElapsedFrameTime => TimeInfo.Elapsed;
+            public double FramesPerSecond => 1 / FRAME_INTERVAL;
+            public FrameTimeInfo TimeInfo { get; private set; }
+        }
+
+        private class MockFrameStableClock : GameplayClock, IFrameStableClock
+        {
+            public MockFrameStableClock(MockFrameBasedClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+
+            public void Seek(double time) => (UnderlyingClock as MockFrameBasedClock)?.Seek(time);
+
+            public IBindable<bool> IsCatchingUp => new Bindable<bool>();
+            public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
+        }
+
+        private class DrawableCookieziRuleset : DrawableRuleset
+        {
+            public DrawableCookieziRuleset(Ruleset ruleset, IFrameStableClock clock)
+                : base(ruleset)
+            {
+                FrameStableClock = clock;
+            }
+
+#pragma warning disable CS0067
+            public override event Action<JudgementResult>? NewResult;
+            public override event Action<JudgementResult>? RevertResult;
+#pragma warning restore CS0067
+            public override Playfield? Playfield => null;
+            public override Container? Overlays => null;
+            public override Container? FrameStableComponents => null;
+            public override IFrameStableClock FrameStableClock { get; }
+
+            internal override bool FrameStablePlayback { get; set; }
+            public override IReadOnlyList<Mod> Mods => Array.Empty<Mod>();
+            public override IEnumerable<HitObject> Objects => Array.Empty<HitObject>();
+            public override double GameplayStartTime => 0;
+            public override GameplayCursorContainer? Cursor => null;
+
+            public override void SetReplayScore(Score replayScore)
+            {
+            }
+
+            public override void SetRecordTarget(Score score)
+            {
+            }
+
+            public override void RequestResume(Action continueResume)
+            {
+            }
+
+            public override void CancelResume()
+            {
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
deleted file mode 100644
index 8bc2eae1d4..0000000000
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecondCounter.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.
-
-namespace osu.Game.Tests.Visual.Gameplay
-{
-    public class TestSceneKeysPerSecondCounter : OsuManualInputManagerTestScene
-    {
-    }
-}

From 0e1efbd865c96a2aa53c98f80cc1b00d287f2190 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 01:03:47 +0200
Subject: [PATCH 067/709] Rename `DrawableCookieziRuleset` to
 `MockDrawableRuleset`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
index 4bda998c49..edfba7f154 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         CachedDependencies = new (Type, object)[]
                         {
                             (typeof(GameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
-                            (typeof(DrawableRuleset), new DrawableCookieziRuleset(ruleset, mainClock))
+                            (typeof(DrawableRuleset), new MockDrawableRuleset(ruleset, mainClock))
                         }
                     },
                 };
@@ -261,9 +261,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
         }
 
-        private class DrawableCookieziRuleset : DrawableRuleset
+        private class MockDrawableRuleset : DrawableRuleset
         {
-            public DrawableCookieziRuleset(Ruleset ruleset, IFrameStableClock clock)
+            public MockDrawableRuleset(Ruleset ruleset, IFrameStableClock clock)
                 : base(ruleset)
             {
                 FrameStableClock = clock;

From 3c6461b9e4383174278cf3b4ab7493a6c076473d Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 09:36:35 +0200
Subject: [PATCH 068/709] Remove KPS acronym usage

---
 .../Visual/Gameplay/TestSceneKeysPerSecond.cs    |  2 +-
 osu.Game/Rulesets/UI/DrawableRuleset.cs          |  6 +++---
 osu.Game/Rulesets/UI/RulesetInputManager.cs      | 16 ++++++----------
 .../KeysPerSecondCalculator.cs                   |  2 +-
 .../KeysPerSecondCounter.cs                      |  4 ++--
 osu.Game/Screens/Play/HUDOverlay.cs              |  5 ++---
 6 files changed, 15 insertions(+), 20 deletions(-)
 rename osu.Game/Screens/Play/HUD/{KPSCounter => KeysPerSecond}/KeysPerSecondCalculator.cs (98%)
 rename osu.Game/Screens/Play/HUD/{KPSCounter => KeysPerSecond}/KeysPerSecondCounter.cs (98%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
index edfba7f154..5c1ca18dbc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KPSCounter;
+using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index b28e3355a4..443e4392cf 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -30,7 +30,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KPSCounter;
+using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject contained by this DrawableRuleset.</typeparam>
-    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter, ICanAttachKpsCalculator
+    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter
         where TObject : HitObject
     {
         public override event Action<JudgementResult> NewResult;
@@ -341,7 +341,7 @@ namespace osu.Game.Rulesets.UI
         public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
 
-        public void Attach(KeysPerSecondCalculator kps) => (KeyBindingInputManager as ICanAttachKpsCalculator)?.Attach(kps);
+        public void Attach(KeysPerSecondCalculator calculator) => (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(calculator);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 23e64153eb..2e9986ada6 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -20,12 +20,12 @@ using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KPSCounter;
+using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler, ICanAttachKpsCalculator
+    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
         public readonly KeyBindingContainer<T> KeyBindingContainer;
@@ -187,15 +187,15 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        #region KPS Counter Attachment
+        #region Keys per second Counter Attachment
 
-        public void Attach(KeysPerSecondCalculator kps)
+        public void Attach(KeysPerSecondCalculator calculator)
         {
             var listener = new ActionListener();
 
             KeyBindingContainer.Add(listener);
 
-            kps.Listener = listener;
+            calculator.Listener = listener;
         }
 
         public class ActionListener : KeysPerSecondCalculator.InputListener, IKeyBindingHandler<T>
@@ -257,11 +257,7 @@ namespace osu.Game.Rulesets.UI
     public interface ICanAttachKeyCounter
     {
         void Attach(KeyCounterDisplay keyCounter);
-    }
-
-    public interface ICanAttachKpsCalculator
-    {
-        void Attach(KeysPerSecondCalculator keysPerSecondCalculator);
+        void Attach(KeysPerSecondCalculator calculator);
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
similarity index 98%
rename from osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
rename to osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
index dddef9abaf..ecc9c6ef86 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.UI;
 
-namespace osu.Game.Screens.Play.HUD.KPSCounter
+namespace osu.Game.Screens.Play.HUD.KeysPerSecond
 {
     public class KeysPerSecondCalculator : Component
     {
diff --git a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
similarity index 98%
rename from osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
rename to osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
index 47ebede623..6589dbb719 100644
--- a/osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
@@ -10,11 +10,11 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-// using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osuTK;
+// using osu.Game.Rulesets.UI;
 
-namespace osu.Game.Screens.Play.HUD.KPSCounter
+namespace osu.Game.Screens.Play.HUD.KeysPerSecond
 {
     public class KeysPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
     {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 1c28e04950..20a1a27f3d 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.KPSCounter;
+using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -127,7 +127,6 @@ namespace osu.Game.Screens.Play
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
                 },
-                keysPerSecondCalculator = new KeysPerSecondCalculator()
             };
         }
 
@@ -265,7 +264,7 @@ namespace osu.Game.Screens.Play
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
             (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
-            (drawableRuleset as ICanAttachKpsCalculator)?.Attach(keysPerSecondCalculator);
+            (drawableRuleset as ICanAttachKeyCounter)?.Attach(keysPerSecondCalculator);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }

From 787dee249da553736e006485582a8eaddcf54ef5 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 10:37:06 +0200
Subject: [PATCH 069/709] Move `KeysPerSecondCalculator` instantiation from
 `HUDOverlay` to `Player`

This prevents messing with *future* Skin (de)serialization
---
 osu.Game/Screens/Play/HUDOverlay.cs | 7 ++++---
 osu.Game/Screens/Play/Player.cs     | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 20a1a27f3d..1cddbcac41 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -50,8 +50,7 @@ namespace osu.Game.Screens.Play
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
-        [Cached]
-        private readonly KeysPerSecondCalculator keysPerSecondCalculator;
+        private KeysPerSecondCalculator keysPerSecondCalculator;
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
@@ -131,8 +130,10 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuConfigManager config, INotificationOverlay notificationOverlay)
+        private void load(OsuConfigManager config, INotificationOverlay notificationOverlay, KeysPerSecondCalculator calculator)
         {
+            keysPerSecondCalculator = calculator;
+
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e3844088e2..ba7e01a803 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,6 +34,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
+using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -122,6 +123,8 @@ namespace osu.Game.Screens.Play
         private SkipOverlay skipIntroOverlay;
         private SkipOverlay skipOutroOverlay;
 
+        protected KeysPerSecondCalculator KeysPerSecondCalculator { get; private set; }
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -226,6 +229,9 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(ScoreProcessor);
 
+            KeysPerSecondCalculator = new KeysPerSecondCalculator();
+            dependencies.CacheAs(KeysPerSecondCalculator);
+
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
@@ -442,6 +448,7 @@ namespace osu.Game.Screens.Play
                         OnRetry = Restart,
                         OnQuit = () => PerformExit(true),
                     },
+                    KeysPerSecondCalculator
                 },
             };
 

From d29cba80e9705a2a28c4dff23c0dd55312923654 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 11:01:16 +0200
Subject: [PATCH 070/709] Remove useless comment in `KeysPerSecondCounter`

---
 osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
index 6589dbb719..7bd4d41242 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
 using osuTK;
-// using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.KeysPerSecond
 {

From 9b252b1d81ce40307324e2a3197433dd874d464c Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 11 Aug 2022 11:58:30 +0200
Subject: [PATCH 071/709] Make `KeysPerSecondCalculator` dependency in
 `HUDOverlay` nullable

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 2 ++
 osu.Game/Screens/Play/HUDOverlay.cs         | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 2e9986ada6..590a305f77 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -191,6 +191,8 @@ namespace osu.Game.Rulesets.UI
 
         public void Attach(KeysPerSecondCalculator calculator)
         {
+            if (calculator == null) return;
+
             var listener = new ActionListener();
 
             KeyBindingContainer.Add(listener);
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 1cddbcac41..458e19826b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -50,7 +50,8 @@ namespace osu.Game.Screens.Play
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
-        private KeysPerSecondCalculator keysPerSecondCalculator;
+        [Resolved(canBeNull: true)]
+        private KeysPerSecondCalculator keysPerSecondCalculator { get; set; }
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
@@ -130,10 +131,8 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuConfigManager config, INotificationOverlay notificationOverlay, KeysPerSecondCalculator calculator)
+        private void load(OsuConfigManager config, INotificationOverlay notificationOverlay)
         {
-            keysPerSecondCalculator = calculator;
-
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);

From 78fe72476de7ea3b591596480059741182259b45 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 13 Aug 2022 00:01:40 +0200
Subject: [PATCH 072/709] Adjust parameters

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 716fa990c9..3c0642ca15 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                 if (i == 0 ||
                     (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6) ||
                     OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
-                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.3))
+                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.4))
                 {
-                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0012f);
+                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.001f);
                     flowDirection = !flowDirection;
                 }
 

From 8c624d3269902ea8f83e874fbfebd204c97b8206 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 13 Aug 2022 00:57:49 +0200
Subject: [PATCH 073/709] Add comments and improve code readability

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 62 +++++++++++++++++-----
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 3c0642ca15..0a89f3eb43 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -29,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
-            if (!(beatmap is OsuBeatmap osuBeatmap))
+            if (beatmap is not OsuBeatmap osuBeatmap)
                 return;
 
             Seed.Value ??= RNG.Next();
@@ -38,17 +39,17 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             var positionInfos = OsuHitObjectGenerationUtils.GeneratePositionInfos(osuBeatmap.HitObjects);
 
-            float sequenceOffset = 0;
+            // Offsets the angles of all hit objects in a "section" by the same amount.
+            float sectionOffset = 0;
+
+            // Whether the angles are positive or negative (clockwise or counter-clockwise flow).
             bool flowDirection = false;
 
             for (int i = 0; i < positionInfos.Count; i++)
             {
-                if (i == 0 ||
-                    (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6) ||
-                    OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject, true) ||
-                    (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(osuBeatmap, positionInfos[i - 1].HitObject) && rng.NextDouble() < 0.4))
+                if (shouldStartNewSection(osuBeatmap, positionInfos, i, 0.6f, 0.4f))
                 {
-                    sequenceOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.001f);
+                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.001f);
                     flowDirection = !flowDirection;
                 }
 
@@ -59,21 +60,25 @@ namespace osu.Game.Rulesets.Osu.Mods
                 }
                 else
                 {
+                    // Offsets only the angle of the current hit object if a flow change occurs.
                     float flowChangeOffset = 0;
+
+                    // Offsets only the angle of the current hit object.
                     float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
 
-                    if (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng.NextDouble() < 0.6)
+                    if (shouldApplyFlowChange(positionInfos, i, 0.6f))
                     {
                         flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
                         flowDirection = !flowDirection;
                     }
 
-                    positionInfos[i].RelativeAngle = getRelativeTargetAngle(
-                        positionInfos[i].DistanceFromPrevious,
-                        (sequenceOffset + oneTimeOffset) * positionInfos[i].DistanceFromPrevious +
-                        flowChangeOffset * (playfield_diagonal - positionInfos[i].DistanceFromPrevious),
-                        flowDirection
-                    );
+                    float totalOffset =
+                        // sectionOffset and oneTimeOffset should mainly affect patterns with large spacing.
+                        (sectionOffset + oneTimeOffset) * positionInfos[i].DistanceFromPrevious +
+                        // flowChangeOffset should mainly affect streams.
+                        flowChangeOffset * (playfield_diagonal - positionInfos[i].DistanceFromPrevious);
+
+                    positionInfos[i].RelativeAngle = getRelativeTargetAngle(positionInfos[i].DistanceFromPrevious, totalOffset, flowDirection);
                 }
             }
 
@@ -89,5 +94,34 @@ namespace osu.Game.Rulesets.Osu.Mods
             float relativeAngle = (float)Math.PI - angle;
             return flowDirection ? -relativeAngle : relativeAngle;
         }
+
+        /// <summary>
+        /// A new section should be started...<br/>
+        /// ...at the beginning of the <see cref="OsuBeatmap"/>.<br/>
+        /// ...on every combo start with a probability of <paramref name="newComboProbability"/> (excluding new-combo-spam and 1-2-combos).<br/>
+        /// ...on every downbeat.<br/>
+        /// ...on every beat with a probability of <paramref name="beatProbability"/>.<br/>
+        /// </summary>
+        /// <returns>Whether a new section should be started at the current <see cref="OsuHitObject"/>.</returns>
+        private bool shouldStartNewSection(
+            OsuBeatmap beatmap,
+            IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos,
+            int i,
+            float newComboProbability,
+            float beatProbability
+        ) =>
+            i == 0 ||
+            (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng?.NextDouble() < newComboProbability) ||
+            OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true) ||
+            (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject) && rng?.NextDouble() < beatProbability);
+
+        /// <summary>
+        /// A flow change should occur on every combo start with a probability of <paramref name="probability"/> (excluding new-combo-spam and 1-2-combos).
+        /// </summary>
+        /// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns>
+        private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i, float probability) =>
+            positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
+            positionInfos[i - 1].HitObject.NewCombo &&
+            rng?.NextDouble() < probability;
     }
 }

From 7a41b9f25a35c375670103baad777e15ea231e59 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sat, 13 Aug 2022 03:11:58 +0200
Subject: [PATCH 074/709] Adjust angle and `sectionOffset` calculations

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 0a89f3eb43..2be1ad231a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (shouldStartNewSection(osuBeatmap, positionInfos, i, 0.6f, 0.4f))
                 {
-                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.001f);
+                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0008f);
                     flowDirection = !flowDirection;
                 }
 
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
         private static float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 320))) + 0.5 + offset);
+            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310))) + 0.5 + offset);
             float relativeAngle = (float)Math.PI - angle;
             return flowDirection ? -relativeAngle : relativeAngle;
         }

From e08f71797ec89bbcf41be2689a6f9d939623d4ba Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sat, 13 Aug 2022 04:27:26 +0200
Subject: [PATCH 075/709] Change displayed metric from "KPS" to "clicks/s"

---
 .../HUD/KeysPerSecond/KeysPerSecondCounter.cs | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
index 7bd4d41242..a5c122f5b1 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
@@ -80,13 +80,30 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
                             Origin = Anchor.BottomLeft,
                             Font = OsuFont.Numeric.With(size: 16, fixedWidth: true)
                         },
-                        new OsuSpriteText
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            Font = OsuFont.Numeric.With(size: 8, fixedWidth: true),
-                            Text = @"KPS",
-                            Padding = new MarginPadding { Bottom = 1.5f }, // align baseline better
+                            Direction = FillDirection.Vertical,
+                            AutoSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopLeft,
+                                    Origin = Anchor.TopLeft,
+                                    Font = OsuFont.Numeric.With(size: 6, fixedWidth: false),
+                                    Text = @"clicks",
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.TopLeft,
+                                    Origin = Anchor.TopLeft,
+                                    Font = OsuFont.Numeric.With(size: 6, fixedWidth: false),
+                                    Text = @"/sec",
+                                    Padding = new MarginPadding { Bottom = 3f }, // align baseline better
+                                }
+                            }
                         }
                     }
                 };

From fa2ebe1d5f8fde264e4253f16195fb73f9db0b35 Mon Sep 17 00:00:00 2001
From: Josh <joshua.brest99@gmail.com>
Date: Sat, 13 Aug 2022 18:02:29 +0800
Subject: [PATCH 076/709] add basic touch functionality

---
 osu.Game.Rulesets.Catch/CatchInputManager.cs       | 2 ++
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/CatchInputManager.cs b/osu.Game.Rulesets.Catch/CatchInputManager.cs
index 86f35c8cee..5b62154a34 100644
--- a/osu.Game.Rulesets.Catch/CatchInputManager.cs
+++ b/osu.Game.Rulesets.Catch/CatchInputManager.cs
@@ -4,11 +4,13 @@
 #nullable disable
 
 using System.ComponentModel;
+using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Catch
 {
+    [Cached]
     public class CatchInputManager : RulesetInputManager<CatchAction>
     {
         public CatchInputManager(RulesetInfo ruleset)
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index b6cea92173..83dc5770a6 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -32,6 +33,13 @@ namespace osu.Game.Rulesets.Catch.UI
             TimeRange.Value = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450);
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            KeyBindingInputManager.Add(new TouchInputField());
+        }
+
+
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
         protected override ReplayRecorder CreateReplayRecorder(Score score) => new CatchReplayRecorder(score, (CatchPlayfield)Playfield);

From 757d236e14460ad5af6a1f3b7b901c713cd492d6 Mon Sep 17 00:00:00 2001
From: Josh <joshua.brest99@gmail.com>
Date: Sat, 13 Aug 2022 18:55:31 +0800
Subject: [PATCH 077/709] Add the UI file

---
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 280 ++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/UI/TouchInputField.cs

diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
new file mode 100644
index 0000000000..1219ebd02d
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -0,0 +1,280 @@
+// 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.Allocation;
+using System.Diagnostics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osuTK.Graphics;
+using osuTK;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class TouchInputField : VisibilityContainer
+    {
+        public enum TouchCatchAction
+        {
+            MoveLeft = 0,
+            MoveRight = 1,
+            DashLeft = 2,
+            DashRight = 3,
+            None = 4
+        }
+
+        private Dictionary<object, TouchCatchAction> trackedActions = new Dictionary<object, TouchCatchAction>();
+
+        private KeyBindingContainer<CatchAction> keyBindingContainer = null!;
+
+        private Container mainContent = null!;
+
+        // Fill values with null because UI is not declared in constructor
+        private ArrowHitbox leftBox = null!;
+        private ArrowHitbox rightBox = null!;
+        private ArrowHitbox leftDashBox = null!;
+        private ArrowHitbox rightDashBox = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(CatchInputManager catchInputManager, OsuColour colours)
+        {
+            Show();
+            Debug.Assert(catchInputManager.KeyBindingContainer != null);
+
+            keyBindingContainer = catchInputManager.KeyBindingContainer;
+
+            // Container should handle input everywhere.
+            RelativeSizeAxes = Axes.Both;
+
+
+            Children = new Drawable[]
+            {
+                mainContent = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    RelativePositionAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Blue)
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.CentreLeft,
+                            X = 0,
+                            RelativePositionAxes = Axes.Both,
+                            Size = new Vector2(100.0f, 100.0f)
+                        },
+                        rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Blue)
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.CentreRight,
+                            X = 0,
+                            RelativePositionAxes = Axes.Both,
+                            Size = new Vector2(100.0f, 100.0f),
+                        },
+                        leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Pink)
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.CentreLeft,
+                            X = 0.1f,
+                            RelativePositionAxes = Axes.Both,
+                            Size = new Vector2(100.0f, 100.0f),
+                        },
+                        rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Pink)
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.CentreRight,
+                            X = -0.1f,
+                            RelativePositionAxes = Axes.Both,
+                            Size = new Vector2(100.0f, 100.0f),
+                        },
+                    }
+                },
+            };
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            // Hide whenever the keyboard is used.
+            Hide();
+            return false;
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            if (getTouchCatchActionFromInput(e.MousePosition) != TouchCatchAction.None)
+                return false;
+
+            handleDown(e.Button, e.ScreenSpaceMousePosition);
+            return true;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            if (getTouchCatchActionFromInput(e.MousePosition) != TouchCatchAction.None)
+                return;
+
+            handleUp(e.Button);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnTouchMove(TouchMoveEvent e)
+        {
+            // I'm not sure if this is posible but let's be safe
+            if (!trackedActions.ContainsKey(e.Touch.Source))
+                trackedActions.Add(e.Touch.Source, TouchCatchAction.None);
+
+            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.MousePosition);
+
+            calculateActiveKeys();
+
+            base.OnTouchMove(e);
+        }
+
+        protected override bool OnTouchDown(TouchDownEvent e)
+        {
+            handleDown(e.Touch.Source, e.ScreenSpaceTouchDownPosition);
+            return true;
+        }
+
+        protected override void OnTouchUp(TouchUpEvent e)
+        {
+            handleUp(e.Touch.Source);
+            base.OnTouchUp(e);
+        }
+
+        private CatchAction removeDashFromAction(TouchCatchAction touchCatchAction)
+        {
+            if (touchCatchAction == TouchCatchAction.DashLeft || touchCatchAction == TouchCatchAction.MoveLeft)
+                return CatchAction.MoveLeft;
+            return CatchAction.MoveRight;
+        }
+
+        private void calculateActiveKeys()
+        {
+            if (trackedActions.ContainsValue(TouchCatchAction.DashLeft) || trackedActions.ContainsValue(TouchCatchAction.MoveLeft))
+                keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.MoveLeft);
+
+            if (trackedActions.ContainsValue(TouchCatchAction.DashRight) || trackedActions.ContainsValue(TouchCatchAction.MoveRight))
+                keyBindingContainer.TriggerPressed(CatchAction.MoveRight);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.MoveRight);
+
+            if (trackedActions.ContainsValue(TouchCatchAction.DashRight) || trackedActions.ContainsValue(TouchCatchAction.DashLeft))
+                keyBindingContainer.TriggerPressed(CatchAction.Dash);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.Dash);
+        }
+
+        private void handleDown(object source, Vector2 position)
+        {
+            Show();
+
+            TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
+
+            // Not too sure how this can happen, but let's avoid throwing.
+            if (trackedActions.ContainsKey(source))
+                return;
+
+            trackedActions.Add(source, catchAction);
+            calculateActiveKeys();
+        }
+
+        private void handleUp(object source)
+        {
+            trackedActions.Remove(source);
+
+            calculateActiveKeys();
+        }
+
+        private TouchCatchAction getTouchCatchActionFromInput(Vector2 inputPosition)
+        {
+            if (leftDashBox.Contains(inputPosition))
+                return TouchCatchAction.DashLeft;
+            if (rightDashBox.Contains(inputPosition))
+                return TouchCatchAction.DashRight;
+            if (leftBox.Contains(inputPosition))
+                return TouchCatchAction.MoveLeft;
+            if (rightBox.Contains(inputPosition))
+                return TouchCatchAction.MoveRight;
+            return TouchCatchAction.None;
+        }
+
+        protected override void PopIn()
+        {
+            mainContent.FadeIn(500, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            mainContent.FadeOut(300);
+        }
+
+        private class ArrowHitbox : CompositeDrawable, IKeyBindingHandler<CatchAction>
+        {
+            private readonly TouchCatchAction handledAction;
+
+            private readonly Box overlay;
+
+            private readonly Dictionary<object, TouchCatchAction> trackedActions;
+
+            private bool isHiglighted = false;
+
+            public ArrowHitbox(TouchCatchAction handledAction, ref Dictionary<object, TouchCatchAction> trackedActions, Color4 colour)
+            {
+                this.handledAction = handledAction;
+                this.trackedActions = trackedActions;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Container
+                    {
+                        Width = 1,
+                        Height = 1,
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            overlay = new Box
+                            {
+                                Alpha = 0,
+                                Colour = colour.Multiply(1.4f).Darken(2.8f),
+                                Blending = BlendingParameters.Additive,
+                                Size = new Vector2(100.0f, 100.0f),
+                            },
+                            new Box
+                            {
+                                Alpha = 0.5f,
+                                Colour = colour,
+                                Size = new Vector2(100.0f, 100.0f),
+                            }
+                        }
+                    }
+                };
+            }
+
+            public bool OnPressed(KeyBindingPressEvent<CatchAction> _)
+            {
+                if (trackedActions.ContainsValue(handledAction))
+                {
+                    isHiglighted = true;
+                    overlay.FadeTo(0.5f, 80, Easing.OutQuint);
+                }
+                return false;
+            }
+
+            public void OnReleased(KeyBindingReleaseEvent<CatchAction> _)
+            {
+                if (isHiglighted && !trackedActions.ContainsValue(handledAction))
+                {
+                    isHiglighted = false;
+                    overlay.FadeOut(1000, Easing.Out);
+                }
+            }
+        }
+    }
+}

From 09e45f39b2aa8c1bb3f359133c3ca30b564629ea Mon Sep 17 00:00:00 2001
From: Josh <joshua.brest99@gmail.com>
Date: Sat, 13 Aug 2022 19:55:47 +0800
Subject: [PATCH 078/709] Add the touchinputfield file because it was untracked

---
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
index 1219ebd02d..cb853d1abd 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -146,13 +146,6 @@ namespace osu.Game.Rulesets.Catch.UI
             base.OnTouchUp(e);
         }
 
-        private CatchAction removeDashFromAction(TouchCatchAction touchCatchAction)
-        {
-            if (touchCatchAction == TouchCatchAction.DashLeft || touchCatchAction == TouchCatchAction.MoveLeft)
-                return CatchAction.MoveLeft;
-            return CatchAction.MoveRight;
-        }
-
         private void calculateActiveKeys()
         {
             if (trackedActions.ContainsValue(TouchCatchAction.DashLeft) || trackedActions.ContainsValue(TouchCatchAction.MoveLeft))

From d5f10cbb9d1396ab10c32981c436729fb4c2c639 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 14 Aug 2022 18:53:00 +0200
Subject: [PATCH 079/709] Revert 787dee24 and initialize calculator in
 `HUDOverlay`

---
 osu.Game/Screens/Play/HUDOverlay.cs | 5 +++--
 osu.Game/Screens/Play/Player.cs     | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 458e19826b..20f7f7d6c2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -50,8 +50,8 @@ namespace osu.Game.Screens.Play
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
-        [Resolved(canBeNull: true)]
-        private KeysPerSecondCalculator keysPerSecondCalculator { get; set; }
+        [Cached]
+        private readonly KeysPerSecondCalculator keysPerSecondCalculator;
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
@@ -127,6 +127,7 @@ namespace osu.Game.Screens.Play
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
                 },
+                keysPerSecondCalculator = new KeysPerSecondCalculator()
             };
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ba7e01a803..e3844088e2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,7 +34,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
-using osu.Game.Screens.Play.HUD.KeysPerSecond;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -123,8 +122,6 @@ namespace osu.Game.Screens.Play
         private SkipOverlay skipIntroOverlay;
         private SkipOverlay skipOutroOverlay;
 
-        protected KeysPerSecondCalculator KeysPerSecondCalculator { get; private set; }
-
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -229,9 +226,6 @@ namespace osu.Game.Screens.Play
 
             dependencies.CacheAs(ScoreProcessor);
 
-            KeysPerSecondCalculator = new KeysPerSecondCalculator();
-            dependencies.CacheAs(KeysPerSecondCalculator);
-
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
@@ -448,7 +442,6 @@ namespace osu.Game.Screens.Play
                         OnRetry = Restart,
                         OnQuit = () => PerformExit(true),
                     },
-                    KeysPerSecondCalculator
                 },
             };
 

From 5106c00a9c5010f751b428a7b0726d95bc5b7620 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 14 Aug 2022 19:02:29 +0200
Subject: [PATCH 080/709] Improve code quality

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 2be1ad231a..ce54d87dfa 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             for (int i = 0; i < positionInfos.Count; i++)
             {
-                if (shouldStartNewSection(osuBeatmap, positionInfos, i, 0.6f, 0.4f))
+                if (shouldStartNewSection(osuBeatmap, positionInfos, i))
                 {
                     sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0008f);
                     flowDirection = !flowDirection;
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // Offsets only the angle of the current hit object.
                     float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
 
-                    if (shouldApplyFlowChange(positionInfos, i, 0.6f))
+                    if (shouldApplyFlowChange(positionInfos, i))
                     {
                         flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
                         flowDirection = !flowDirection;
@@ -95,33 +95,35 @@ namespace osu.Game.Rulesets.Osu.Mods
             return flowDirection ? -relativeAngle : relativeAngle;
         }
 
-        /// <summary>
-        /// A new section should be started...<br/>
-        /// ...at the beginning of the <see cref="OsuBeatmap"/>.<br/>
-        /// ...on every combo start with a probability of <paramref name="newComboProbability"/> (excluding new-combo-spam and 1-2-combos).<br/>
-        /// ...on every downbeat.<br/>
-        /// ...on every beat with a probability of <paramref name="beatProbability"/>.<br/>
-        /// </summary>
         /// <returns>Whether a new section should be started at the current <see cref="OsuHitObject"/>.</returns>
-        private bool shouldStartNewSection(
-            OsuBeatmap beatmap,
-            IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos,
-            int i,
-            float newComboProbability,
-            float beatProbability
-        ) =>
-            i == 0 ||
-            (positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 && positionInfos[i - 1].HitObject.NewCombo && rng?.NextDouble() < newComboProbability) ||
-            OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true) ||
-            (OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject) && rng?.NextDouble() < beatProbability);
+        private bool shouldStartNewSection(OsuBeatmap beatmap, IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
+        {
+            if (i == 0)
+                return true;
+
+            // Exclude new-combo-spam and 1-2-combos.
+            bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
+                                              positionInfos[i - 1].HitObject.NewCombo;
+            bool previousObjectWasOnDownbeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true);
+            bool previousObjectWasOnBeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject);
+
+            return (previousObjectStartedCombo && randomBool(0.6f)) ||
+                   previousObjectWasOnDownbeat ||
+                   (previousObjectWasOnBeat && randomBool(0.4f));
+        }
 
-        /// <summary>
-        /// A flow change should occur on every combo start with a probability of <paramref name="probability"/> (excluding new-combo-spam and 1-2-combos).
-        /// </summary>
         /// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns>
-        private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i, float probability) =>
-            positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
-            positionInfos[i - 1].HitObject.NewCombo &&
+        private bool shouldApplyFlowChange(IReadOnlyList<OsuHitObjectGenerationUtils.ObjectPositionInfo> positionInfos, int i)
+        {
+            // Exclude new-combo-spam and 1-2-combos.
+            bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
+                                              positionInfos[i - 1].HitObject.NewCombo;
+
+            return previousObjectStartedCombo && randomBool(0.6f);
+        }
+
+        /// <returns>true with a probability of <paramref name="probability"/>, false otherwise.</returns>
+        private bool randomBool(float probability) =>
             rng?.NextDouble() < probability;
     }
 }

From 9dc806506e55ca13b39241b50e71a1b7da7a332b Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 14 Aug 2022 19:09:34 +0200
Subject: [PATCH 081/709] Make `ActionListener` and `KeysPerSecondCalculator`
 not rely on events to add timestamps

---
 .../Visual/Gameplay/TestSceneKeysPerSecond.cs | 13 +++++-----
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 11 +++++---
 .../KeysPerSecond/KeysPerSecondCalculator.cs  | 25 ++++++-------------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
index 5c1ca18dbc..ac7b7521c9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
@@ -61,10 +61,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 dependencyContainer!.Children = new Drawable[]
                 {
-                    calculator = new KeysPerSecondCalculator
-                    {
-                        Listener = listener = new ManualInputListener()
-                    },
+                    calculator = new KeysPerSecondCalculator(),
                     new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -77,6 +74,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         }
                     }
                 };
+                calculator!.Listener = listener = new ManualInputListener(calculator!);
             });
         }
 
@@ -208,9 +206,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class ManualInputListener : KeysPerSecondCalculator.InputListener
         {
-            public override event Action? OnNewInput;
+            public void AddInput() => Calculator.AddTimestamp();
 
-            public void AddInput() => OnNewInput?.Invoke();
+            public ManualInputListener(KeysPerSecondCalculator calculator)
+                : base(calculator)
+            {
+            }
         }
 
         private class MockFrameBasedClock : ManualClock, IFrameBasedClock
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 590a305f77..23580bc40a 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.UI
         {
             if (calculator == null) return;
 
-            var listener = new ActionListener();
+            var listener = new ActionListener(calculator);
 
             KeyBindingContainer.Add(listener);
 
@@ -202,11 +202,9 @@ namespace osu.Game.Rulesets.UI
 
         public class ActionListener : KeysPerSecondCalculator.InputListener, IKeyBindingHandler<T>
         {
-            public override event Action OnNewInput;
-
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                OnNewInput?.Invoke();
+                Calculator.AddTimestamp();
 
                 return false;
             }
@@ -214,6 +212,11 @@ namespace osu.Game.Rulesets.UI
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
             }
+
+            public ActionListener(KeysPerSecondCalculator calculator)
+                : base(calculator)
+            {
+            }
         }
 
         #endregion
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
index ecc9c6ef86..20ab09e9cc 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
             {
                 onResetRequested?.Invoke();
                 listener = value;
-                listener.OnNewInput += addTimestamp;
             }
         }
 
@@ -43,12 +42,9 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
         {
             get
             {
-                if (gameplayClock != null)
+                if (gameplayClock?.TrueGameplayRate > 0)
                 {
-                    if (gameplayClock.TrueGameplayRate > 0)
-                    {
-                        baseRate = gameplayClock.TrueGameplayRate;
-                    }
+                    baseRate = gameplayClock.TrueGameplayRate;
                 }
 
                 return baseRate;
@@ -71,12 +67,9 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
         {
             timestamps.Clear();
             maxTime = double.NegativeInfinity;
-
-            if (listener != null)
-                listener.OnNewInput -= addTimestamp;
         }
 
-        private void addTimestamp()
+        public void AddTimestamp()
         {
             if (workingClock == null) return;
 
@@ -96,20 +89,16 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
             return relativeTime > 0 && relativeTime <= span;
         }
 
-        ~KeysPerSecondCalculator()
-        {
-            cleanUp();
-        }
-
         public abstract class InputListener : Component
         {
-            protected InputListener()
+            protected KeysPerSecondCalculator Calculator;
+
+            protected InputListener(KeysPerSecondCalculator calculator)
             {
                 RelativeSizeAxes = Axes.Both;
                 Depth = float.MinValue;
+                Calculator = calculator;
             }
-
-            public abstract event Action? OnNewInput;
         }
     }
 }

From 2aa3a1b50d558b8c01097b7c601889848596d8f6 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 14 Aug 2022 20:12:11 +0200
Subject: [PATCH 082/709] Rename all "KeysPerSecond" usages to
 "ClicksPerSecond"

---
 ...sPerSecond.cs => TestSceneClicksPerSecond.cs} | 16 ++++++++--------
 osu.Game/Rulesets/UI/DrawableRuleset.cs          |  4 ++--
 osu.Game/Rulesets/UI/RulesetInputManager.cs      | 10 +++++-----
 .../ClicksPerSecondCalculator.cs}                | 10 +++++-----
 .../ClicksPerSecondCounter.cs}                   | 10 +++++-----
 osu.Game/Screens/Play/HUDOverlay.cs              |  8 ++++----
 6 files changed, 29 insertions(+), 29 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneKeysPerSecond.cs => TestSceneClicksPerSecond.cs} (94%)
 rename osu.Game/Screens/Play/HUD/{KeysPerSecond/KeysPerSecondCalculator.cs => ClicksPerSecond/ClicksPerSecondCalculator.cs} (90%)
 rename osu.Game/Screens/Play/HUD/{KeysPerSecond/KeysPerSecondCounter.cs => ClicksPerSecond/ClicksPerSecondCounter.cs} (92%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index ac7b7521c9..8a5bd1af0f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeysPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -19,16 +19,16 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KeysPerSecond;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneKeysPerSecond : OsuTestScene
+    public class TestSceneClicksPerSecond : OsuTestScene
     {
         private DependencyProvidingContainer? dependencyContainer;
         private MockFrameStableClock? mainClock;
-        private KeysPerSecondCalculator? calculator;
+        private ClicksPerSecondCalculator? calculator;
         private ManualInputListener? listener;
 
         [SetUpSteps]
@@ -61,12 +61,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 dependencyContainer!.Children = new Drawable[]
                 {
-                    calculator = new KeysPerSecondCalculator(),
+                    calculator = new ClicksPerSecondCalculator(),
                     new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
-                        CachedDependencies = new (Type, object)[] { (typeof(KeysPerSecondCalculator), calculator) },
-                        Child = new KeysPerSecondCounter // For visual debugging, has no real purpose in the tests
+                        CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
+                        Child = new ClicksPerSecondCounter // For visual debugging, has no real purpose in the tests
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -204,11 +204,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         #region Mock classes
 
-        private class ManualInputListener : KeysPerSecondCalculator.InputListener
+        private class ManualInputListener : ClicksPerSecondCalculator.InputListener
         {
             public void AddInput() => Calculator.AddTimestamp();
 
-            public ManualInputListener(KeysPerSecondCalculator calculator)
+            public ManualInputListener(ClicksPerSecondCalculator calculator)
                 : base(calculator)
             {
             }
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 443e4392cf..cb483bff81 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -30,7 +30,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KeysPerSecond;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI
@@ -341,7 +341,7 @@ namespace osu.Game.Rulesets.UI
         public void Attach(KeyCounterDisplay keyCounter) =>
             (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
 
-        public void Attach(KeysPerSecondCalculator calculator) => (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(calculator);
+        public void Attach(ClicksPerSecondCalculator calculator) => (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(calculator);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 23580bc40a..4b7ce22cfc 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -20,7 +20,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD.KeysPerSecond;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
@@ -189,7 +189,7 @@ namespace osu.Game.Rulesets.UI
 
         #region Keys per second Counter Attachment
 
-        public void Attach(KeysPerSecondCalculator calculator)
+        public void Attach(ClicksPerSecondCalculator calculator)
         {
             if (calculator == null) return;
 
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.UI
             calculator.Listener = listener;
         }
 
-        public class ActionListener : KeysPerSecondCalculator.InputListener, IKeyBindingHandler<T>
+        public class ActionListener : ClicksPerSecondCalculator.InputListener, IKeyBindingHandler<T>
         {
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
@@ -213,7 +213,7 @@ namespace osu.Game.Rulesets.UI
             {
             }
 
-            public ActionListener(KeysPerSecondCalculator calculator)
+            public ActionListener(ClicksPerSecondCalculator calculator)
                 : base(calculator)
             {
             }
@@ -262,7 +262,7 @@ namespace osu.Game.Rulesets.UI
     public interface ICanAttachKeyCounter
     {
         void Attach(KeyCounterDisplay keyCounter);
-        void Attach(KeysPerSecondCalculator calculator);
+        void Attach(ClicksPerSecondCalculator calculator);
     }
 
     public class RulesetInputManagerInputState<T> : InputState
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
similarity index 90%
rename from osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
rename to osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 20ab09e9cc..9dc8615fb6 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -9,9 +9,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.UI;
 
-namespace osu.Game.Screens.Play.HUD.KeysPerSecond
+namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public class KeysPerSecondCalculator : Component
+    public class ClicksPerSecondCalculator : Component
     {
         private readonly List<double> timestamps;
 
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
         public bool Ready => workingClock != null && gameplayClock != null && listener != null;
         public int Value => timestamps.Count(isTimestampWithinSpan);
 
-        public KeysPerSecondCalculator()
+        public ClicksPerSecondCalculator()
         {
             RelativeSizeAxes = Axes.Both;
             timestamps = new List<double>();
@@ -91,9 +91,9 @@ namespace osu.Game.Screens.Play.HUD.KeysPerSecond
 
         public abstract class InputListener : Component
         {
-            protected KeysPerSecondCalculator Calculator;
+            protected ClicksPerSecondCalculator Calculator;
 
-            protected InputListener(KeysPerSecondCalculator calculator)
+            protected InputListener(ClicksPerSecondCalculator calculator)
             {
                 RelativeSizeAxes = Axes.Both;
                 Depth = float.MinValue;
diff --git a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
rename to osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
index a5c122f5b1..049f38ba4c 100644
--- a/osu.Game/Screens/Play/HUD/KeysPerSecond/KeysPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
@@ -13,27 +13,27 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Skinning;
 using osuTK;
 
-namespace osu.Game.Screens.Play.HUD.KeysPerSecond
+namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
-    public class KeysPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
+    public class ClicksPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
     {
         private const float alpha_when_invalid = 0.3f;
 
         private readonly Bindable<bool> valid = new Bindable<bool>();
 
-        private KeysPerSecondCalculator? calculator;
+        private ClicksPerSecondCalculator? calculator;
 
         protected override double RollingDuration => 350;
 
         public bool UsesFixedAnchor { get; set; }
 
-        public KeysPerSecondCounter()
+        public ClicksPerSecondCounter()
         {
             Current.Value = 0;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, KeysPerSecondCalculator calculator)
+        private void load(OsuColour colours, ClicksPerSecondCalculator calculator)
         {
             this.calculator = calculator;
             Colour = colours.BlueLighter;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 20f7f7d6c2..b27efaf13a 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.HUD.KeysPerSecond;
+using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
         [Cached]
-        private readonly KeysPerSecondCalculator keysPerSecondCalculator;
+        private readonly ClicksPerSecondCalculator clicksPerSecondCalculator;
 
         public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
 
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Play
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
                 },
-                keysPerSecondCalculator = new KeysPerSecondCalculator()
+                clicksPerSecondCalculator = new ClicksPerSecondCalculator()
             };
         }
 
@@ -265,7 +265,7 @@ namespace osu.Game.Screens.Play
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
             (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
-            (drawableRuleset as ICanAttachKeyCounter)?.Attach(keysPerSecondCalculator);
+            (drawableRuleset as ICanAttachKeyCounter)?.Attach(clicksPerSecondCalculator);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }

From ff497c452fd48978b5f4b7021086f01368c4d62d Mon Sep 17 00:00:00 2001
From: Josh <joshua.brest99@gmail.com>
Date: Mon, 15 Aug 2022 17:23:29 +0800
Subject: [PATCH 083/709] Fix formatting + Add tests + fix touch UI

---
 .../TestSceneCatchTouchInput.cs               |  45 ++++++++
 .../UI/DrawableCatchRuleset.cs                |   1 -
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 104 +++++++++++-------
 3 files changed, 110 insertions(+), 40 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
new file mode 100644
index 0000000000..03d031a0a8
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
@@ -0,0 +1,45 @@
+// 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.
+
+#nullable disable
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneCatchTouchInput : OsuTestScene
+    {
+        private TouchInputField touchInputField = null!;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create inputfield", () =>
+            {
+                Child = new CatchInputManager(new CatchRuleset().RulesetInfo)
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        touchInputField = new TouchInputField
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre
+                        }
+                    }
+                };
+            });
+        }
+
+        [Test]
+        public void TestInputField()
+        {
+            AddStep("show inputfield", () => touchInputField.Show());
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 83dc5770a6..b84d0c60d5 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Rulesets.Catch.UI
             KeyBindingInputManager.Add(new TouchInputField());
         }
 
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
         protected override ReplayRecorder CreateReplayRecorder(Score score) => new CatchReplayRecorder(score, (CatchPlayfield)Playfield);
diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
index cb853d1abd..3b92ffa445 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -50,48 +50,70 @@ namespace osu.Game.Rulesets.Catch.UI
             // Container should handle input everywhere.
             RelativeSizeAxes = Axes.Both;
 
-
             Children = new Drawable[]
             {
                 mainContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     RelativePositionAxes = Axes.Both,
+                    Alpha = 0,
                     Children = new Drawable[]
                     {
-                        leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Blue)
+                        new Container
                         {
-                            Anchor = Anchor.TopLeft,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 0.15f,
+                            Height = 1,
+                            Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            X = 0,
-                            RelativePositionAxes = Axes.Both,
-                            Size = new Vector2(100.0f, 100.0f)
+                            Children = new Drawable[]
+                            {
+                                leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Gray2)
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    RelativeSizeAxes = Axes.Both,
+                                    RelativePositionAxes = Axes.Both,
+                                    Width = 0.5f,
+                                },
+                                leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Gray3)
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    RelativeSizeAxes = Axes.Both,
+                                    RelativePositionAxes = Axes.Both,
+                                    Width = 0.5f,
+                                }
+                            }
                         },
-                        rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Blue)
+                        new Container
                         {
-                            Anchor = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 0.15f,
+                            Height = 1,
+                            Anchor = Anchor.CentreRight,
                             Origin = Anchor.CentreRight,
-                            X = 0,
-                            RelativePositionAxes = Axes.Both,
-                            Size = new Vector2(100.0f, 100.0f),
+                            Children = new Drawable[]
+                            {
+                                rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Gray2)
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    RelativeSizeAxes = Axes.Both,
+                                    RelativePositionAxes = Axes.Both,
+                                    Width = 0.5f,
+                                },
+                                rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Gray3)
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    RelativeSizeAxes = Axes.Both,
+                                    RelativePositionAxes = Axes.Both,
+                                    Width = 0.5f,
+                                },
+                            }
                         },
-                        leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Pink)
-                        {
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.CentreLeft,
-                            X = 0.1f,
-                            RelativePositionAxes = Axes.Both,
-                            Size = new Vector2(100.0f, 100.0f),
-                        },
-                        rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Pink)
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.CentreRight,
-                            X = -0.1f,
-                            RelativePositionAxes = Axes.Both,
-                            Size = new Vector2(100.0f, 100.0f),
-                        },
-                    }
+                    },
                 },
             };
         }
@@ -99,13 +121,13 @@ namespace osu.Game.Rulesets.Catch.UI
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             // Hide whenever the keyboard is used.
-            Hide();
+            PopOut();
             return false;
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (getTouchCatchActionFromInput(e.MousePosition) != TouchCatchAction.None)
+            if (getTouchCatchActionFromInput(e.ScreenSpaceMousePosition) == TouchCatchAction.None)
                 return false;
 
             handleDown(e.Button, e.ScreenSpaceMousePosition);
@@ -114,14 +136,15 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (getTouchCatchActionFromInput(e.MousePosition) != TouchCatchAction.None)
+            if (getTouchCatchActionFromInput(e.ScreenSpaceMousePosition) == TouchCatchAction.None)
                 return;
 
             handleUp(e.Button);
             base.OnMouseUp(e);
         }
 
-        protected override void OnTouchMove(TouchMoveEvent e)
+        /* I plan to come back to this code to add touch support
+         * protected override void OnTouchMove(TouchMoveEvent e)
         {
             // I'm not sure if this is posible but let's be safe
             if (!trackedActions.ContainsKey(e.Touch.Source))
@@ -132,7 +155,7 @@ namespace osu.Game.Rulesets.Catch.UI
             calculateActiveKeys();
 
             base.OnTouchMove(e);
-        }
+        }*/
 
         protected override bool OnTouchDown(TouchDownEvent e)
         {
@@ -166,7 +189,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void handleDown(object source, Vector2 position)
         {
-            Show();
+            PopIn();
 
             TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
 
@@ -195,6 +218,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 return TouchCatchAction.MoveLeft;
             if (rightBox.Contains(inputPosition))
                 return TouchCatchAction.MoveRight;
+
             return TouchCatchAction.None;
         }
 
@@ -216,7 +240,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private readonly Dictionary<object, TouchCatchAction> trackedActions;
 
-            private bool isHiglighted = false;
+            private bool isHiglighted;
 
             public ArrowHitbox(TouchCatchAction handledAction, ref Dictionary<object, TouchCatchAction> trackedActions, Color4 colour)
             {
@@ -228,7 +252,6 @@ namespace osu.Game.Rulesets.Catch.UI
                     new Container
                     {
                         Width = 1,
-                        Height = 1,
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
@@ -237,13 +260,15 @@ namespace osu.Game.Rulesets.Catch.UI
                                 Alpha = 0,
                                 Colour = colour.Multiply(1.4f).Darken(2.8f),
                                 Blending = BlendingParameters.Additive,
-                                Size = new Vector2(100.0f, 100.0f),
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Both,
                             },
                             new Box
                             {
-                                Alpha = 0.5f,
+                                Alpha = 0.8f,
                                 Colour = colour,
-                                Size = new Vector2(100.0f, 100.0f),
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Both,
                             }
                         }
                     }
@@ -257,6 +282,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     isHiglighted = true;
                     overlay.FadeTo(0.5f, 80, Easing.OutQuint);
                 }
+
                 return false;
             }
 

From be7367b90e5023004bd8352084054eaa8607911a Mon Sep 17 00:00:00 2001
From: Josh <joshua.brest99@gmail.com>
Date: Mon, 15 Aug 2022 17:52:26 +0800
Subject: [PATCH 084/709] Invert the dash and normal hits.

---
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
index 3b92ffa445..771902df65 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -68,18 +68,18 @@ namespace osu.Game.Rulesets.Catch.UI
                             Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
                             {
-                                leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Gray2)
+                                leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Gray3)
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
                                     RelativeSizeAxes = Axes.Both,
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 },
-                                leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Gray3)
+                                leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Gray2)
                                 {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
                                     RelativeSizeAxes = Axes.Both,
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
@@ -95,18 +95,18 @@ namespace osu.Game.Rulesets.Catch.UI
                             Origin = Anchor.CentreRight,
                             Children = new Drawable[]
                             {
-                                rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Gray2)
+                                rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Gray3)
                                 {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
                                     RelativeSizeAxes = Axes.Both,
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 },
-                                rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Gray3)
+                                rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Gray2)
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
                                     RelativeSizeAxes = Axes.Both,
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,

From 3de35a15180fd37a72df6ae3bb72d589797f25ef Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 18 Aug 2022 18:40:02 +0200
Subject: [PATCH 085/709] Update calculator and tests to match changes on
 clocks

---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 22 ++++++++++++++++---
 .../ClicksPerSecondCalculator.cs              |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index 8a5bd1af0f..69868e07b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         RelativeSizeAxes = Axes.Both,
                         CachedDependencies = new (Type, object)[]
                         {
-                            (typeof(GameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
+                            (typeof(IGameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
                             (typeof(DrawableRuleset), new MockDrawableRuleset(ruleset, mainClock))
                         }
                     },
@@ -249,17 +249,33 @@ namespace osu.Game.Tests.Visual.Gameplay
             public FrameTimeInfo TimeInfo { get; private set; }
         }
 
-        private class MockFrameStableClock : GameplayClock, IFrameStableClock
+        private class MockFrameStableClock : IGameplayClock, IFrameStableClock
         {
+            internal readonly IFrameBasedClock UnderlyingClock;
+
+            public readonly BindableBool IsPaused = new BindableBool();
+
             public MockFrameStableClock(MockFrameBasedClock underlyingClock)
-                : base(underlyingClock)
             {
+                UnderlyingClock = underlyingClock;
             }
 
             public void Seek(double time) => (UnderlyingClock as MockFrameBasedClock)?.Seek(time);
 
             public IBindable<bool> IsCatchingUp => new Bindable<bool>();
             public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
+            public double CurrentTime => UnderlyingClock.CurrentTime;
+            public double Rate => UnderlyingClock.Rate;
+            public bool IsRunning => UnderlyingClock.IsRunning;
+            public void ProcessFrame() => UnderlyingClock.ProcessFrame();
+
+            public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
+            public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
+            public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
+            public double TrueGameplayRate => UnderlyingClock.Rate;
+            public double? StartTime => 0;
+            public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
+            IBindable<bool> IGameplayClock.IsPaused => IsPaused;
         }
 
         private class MockDrawableRuleset : DrawableRuleset
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 9dc8615fb6..d9c3c6ffec 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
         private InputListener? listener;
 
         [Resolved]
-        private GameplayClock? gameplayClock { get; set; }
+        private IGameplayClock? gameplayClock { get; set; }
 
         [Resolved(canBeNull: true)]
         private DrawableRuleset? drawableRuleset { get; set; }

From 3ac6500423a8c7607989e855de3eda71484eca8f Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Fri, 19 Aug 2022 00:49:03 +0200
Subject: [PATCH 086/709] Add new test resources for CPS counter

---
 .../Archives/modified-default-20220818.osk       | Bin 0 -> 1145 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-default-20220818.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-default-20220818.osk b/osu.Game.Tests/Resources/Archives/modified-default-20220818.osk
new file mode 100644
index 0000000000000000000000000000000000000000..92215cbf8655decffeedfabd902ed0e8923bab66
GIT binary patch
literal 1145
zcmWIWW@Zs#U|`^2NLVTqs`|jDa|)2R0W8A6P@J8ar<a+Rsd~nc?~nnH!^OQp?-I6!
zIhDLWcH|g~a8g0`_Fj*iDHf}$%-H&lh%QL_=l}n6)pp&Ow6;L!3rA10G<R*3(3!#5
zo$2zKxorcJkfG!Lre~X&wK5;u*_qyyt2(oP1=C`F9SO->xn6S=HYqNAcrbLkFt<8S
zdHCG=Wxv;FdCR48&5>TQc#^zr@Z(j<8zY0+!z(-V9<9<3Kyi8A6BC6ZpsPE9m=}ma
zF3-$M%h$^)&d*!@>}gOyz$foBzM-3f0#51cg@#<v&^+aH#{0ad?zNB$C(inx^f~S0
zdokn^<LVMUFJGOL`b?U9XHTCyt$)7RtKymHbd_gQQ`DxVJbPaGZ0S?yvzLq6XRQ^V
zGk50n=`*LVdp>E_w1`>3Opjh`99S~7VrLd3s^caHu3EB{k%8ea&}Cvk$N45^=6Qs=
zIOpdU<maX4l@x<r`F2`h_H6@!<M+A$@+qBPHzE6`YO~E2zugBUjJ<bHzr-H8Q)N+C
zh@a7wp4#sx*S_8GLvziMh0<)z|H}W(ztBJV{l70Q6Xt*Io^UbuE6-y8l$2Oc`)=L~
zJ6#waXDoDeO)n3&YF(<a_59ms7oTl2kuy-rt#YYjuu47Ka`C#lQl*EUpc<Q3zmxkC
z4f(B;;uq}N>Yt#t>`Il0=~M34Q~2k%>zY_|J@Sq?YP0NlkD**?k?0eZrEh$HT#c&P
z9%mv}`qyo)_ritmZ>gHp6`p^0>BQEfRwWm`?gy+5d263H)tddC+uj3<PRDV*U7*c(
zPkVDw>ECk}@!ESGR@A<e&w8u7$-HCd7LIo2gJu0XiOxzlyqt}8Oxfh3xcYFSh4ra6
zk4ec344D`Hty*=bn1kn{Q2XnSLjHq=cRa7H;o73j^4!j>LFKi%qnSq2%um-l#P&Pw
z=#<$j^rQXL#=;|O+LN{a9{(t3aqe3de_f6Z*MX%+dkuuRR`--M_xVM-9hRSy`v1+3
zDecZRMT{q9mY8<m{mOV;b6(&)HJh8ZX9}e@e`)&9y09g!r+D5n>*gr!_ZO|AU)E;K
zooDlh4K<=Qcl+?N03(<Qi1~pyI6p5vI5j6Vxda@;-F>VK0p5&EA`G~*98eboG=eBt
z21M6|p4_2&7#JFNL3P0sKe|@*#E8%u4osrhlP0<u=>9~Q;lPaH>i}<7Hjn}qAp8WR
J3xP@)7yzY8uFwDg

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index c7eb334f25..1b03f8ef6b 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -36,7 +36,9 @@ namespace osu.Game.Tests.Skins
             "Archives/modified-default-20220723.osk",
             "Archives/modified-classic-20220723.osk",
             // Covers legacy song progress, UR counter, colour hit error metre.
-            "Archives/modified-classic-20220801.osk"
+            "Archives/modified-classic-20220801.osk",
+            // Covers clicks/s counter
+            "Archives/modified-default-20220818.osk"
         };
 
         /// <summary>

From 5cf54a788adc5601a518b41409a91a9daca76534 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Sun, 21 Aug 2022 03:15:30 +0200
Subject: [PATCH 087/709] Code cleanup for CPS counter

---
 .../ClicksPerSecond/ClicksPerSecondCounter.cs | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
index 049f38ba4c..3ff06d5217 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -19,9 +18,8 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
     {
         private const float alpha_when_invalid = 0.3f;
 
-        private readonly Bindable<bool> valid = new Bindable<bool>();
-
-        private ClicksPerSecondCalculator? calculator;
+        [Resolved(canBeNull: false)]
+        private ClicksPerSecondCalculator calculator { get; set; } = null!;
 
         protected override double RollingDuration => 350;
 
@@ -33,26 +31,19 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, ClicksPerSecondCalculator calculator)
+        private void load(OsuColour colours)
         {
-            this.calculator = calculator;
             Colour = colours.BlueLighter;
-            valid.BindValueChanged(e =>
-                DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));
         }
 
         protected override void Update()
         {
             base.Update();
 
-            valid.Value = calculator != null && calculator.Ready;
-            Current.Value = calculator != null ? calculator.Ready ? calculator.Value : 0 : 0;
+            Current.Value = calculator.Ready ? calculator.Value : 0;
         }
 
-        protected override IHasText CreateText() => new TextComponent
-        {
-            Alpha = alpha_when_invalid
-        };
+        protected override IHasText CreateText() => new TextComponent();
 
         private class TextComponent : CompositeDrawable, IHasText
         {

From c56390cd7b4f7f4c442a321e9a71ce1293e72a3d Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Mon, 22 Aug 2022 00:03:24 +0200
Subject: [PATCH 088/709] Use less custom classes for CPS tests

---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 272 +++++++++---------
 1 file changed, 144 insertions(+), 128 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index 69868e07b4..375726dd9a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
@@ -13,9 +14,9 @@ using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -27,9 +28,12 @@ namespace osu.Game.Tests.Visual.Gameplay
     public class TestSceneClicksPerSecond : OsuTestScene
     {
         private DependencyProvidingContainer? dependencyContainer;
-        private MockFrameStableClock? mainClock;
         private ClicksPerSecondCalculator? calculator;
         private ManualInputListener? listener;
+        private GameplayClockContainer? gameplayClockContainer;
+        private ManualClock? manualClock;
+        private DrawableRuleset? drawableRuleset;
+        private IFrameStableClock? frameStableClock;
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -40,41 +44,20 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 Debug.Assert(ruleset != null);
 
-                Children = new Drawable[]
+                Child = gameplayClockContainer = new GameplayClockContainer(manualClock = new ManualClock());
+                gameplayClockContainer.AddRange(new Drawable[]
                 {
+                    drawableRuleset = new TestDrawableRuleset(frameStableClock = new TestFrameStableClock(manualClock)),
                     dependencyContainer = new DependencyProvidingContainer
                     {
                         RelativeSizeAxes = Axes.Both,
                         CachedDependencies = new (Type, object)[]
                         {
-                            (typeof(IGameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
-                            (typeof(DrawableRuleset), new MockDrawableRuleset(ruleset, mainClock))
-                        }
-                    },
-                };
-            });
-        }
-
-        private void createCalculator()
-        {
-            AddStep("create calculator", () =>
-            {
-                dependencyContainer!.Children = new Drawable[]
-                {
-                    calculator = new ClicksPerSecondCalculator(),
-                    new DependencyProvidingContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
-                        Child = new ClicksPerSecondCounter // For visual debugging, has no real purpose in the tests
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Scale = new Vector2(5),
+                            (typeof(DrawableRuleset), drawableRuleset),
+                            (typeof(IGameplayClock), gameplayClockContainer)
                         }
                     }
-                };
-                calculator!.Listener = listener = new ManualInputListener(calculator!);
+                });
             });
         }
 
@@ -82,6 +65,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestBasicConsistency()
         {
             createCalculator();
+            startClock();
 
             AddStep("Create gradually increasing KPS inputs", () =>
             {
@@ -101,6 +85,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRateAdjustConsistency()
         {
             createCalculator();
+            startClock();
 
             AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
 
@@ -125,6 +110,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestInputsDiscardedOnRewind()
         {
             createCalculator();
+            startClock();
 
             AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
             seek(1000);
@@ -136,38 +122,79 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("KPS didn't changed", () => calculator!.Value == 10);
         }
 
-        private void seek(double time) => AddStep($"Seek main clock to {time}ms", () => mainClock?.Seek(time));
-
-        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () =>
-            (mainClock?.UnderlyingClock as MockFrameBasedClock)!.Rate = rate);
-
-        private void advanceForwards(int frames = 1) => AddStep($"Advance main clock {frames} frame(s) forward.", () =>
+        private void seekAllClocks(double time)
         {
-            if (mainClock == null) return;
+            gameplayClockContainer?.Seek(time);
+            manualClock!.CurrentTime = time;
+        }
 
-            MockFrameBasedClock underlyingClock = (MockFrameBasedClock)mainClock.UnderlyingClock;
-            underlyingClock.Backwards = false;
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
 
-            for (int i = 0; i < frames; i++)
+        #region Quick steps methods
+
+        private void createCalculator()
+        {
+            AddStep("create calculator", () =>
             {
-                underlyingClock.ProcessFrame();
-            }
+                Debug.Assert(dependencyContainer?.Dependencies.Get(typeof(DrawableRuleset)) is DrawableRuleset);
+                dependencyContainer!.Children = new Drawable[]
+                {
+                    calculator = new ClicksPerSecondCalculator(),
+                    new DependencyProvidingContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
+                        Child = new ClicksPerSecondCounter // For visual debugging, has no real purpose in the tests
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(5),
+                        }
+                    }
+                };
+                calculator!.Listener = listener = new ManualInputListener(calculator!);
+            });
+        }
+
+        private void seek(double time) => AddStep($"Seek clocks to {time}ms", () => seekAllClocks(time));
+
+        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () => manualClock!.Rate = rate);
+
+        private void advanceForwards(double time) =>
+            AddStep($"Advance clocks {time} seconds forward.", () =>
+            {
+                gameplayClockContainer!.Seek(gameplayClockContainer.CurrentTime + time * manualClock!.Rate);
+
+                for (int i = 0; i < time; i++)
+                {
+                    frameStableClock?.ProcessFrame();
+                }
+            });
+
+        private void startClock() => AddStep("Start clocks", () =>
+        {
+            gameplayClockContainer?.Start();
+            manualClock!.Rate = 1;
         });
 
+        #endregion
+
+        #region Input generation
+
         private void addInputs(IEnumerable<double> inputs)
         {
-            Debug.Assert(mainClock != null && listener != null);
+            Debug.Assert(manualClock != null && listener != null && gameplayClockContainer != null);
             if (!inputs.Any()) return;
 
-            double baseTime = mainClock.CurrentTime;
+            double baseTime = gameplayClockContainer.CurrentTime;
 
             foreach (double timestamp in inputs)
             {
-                mainClock.Seek(timestamp);
+                seekAllClocks(timestamp);
                 listener.AddInput();
             }
 
-            mainClock.Seek(baseTime);
+            seekAllClocks(baseTime);
         }
 
         private IEnumerable<double> generateGraduallyIncreasingKps()
@@ -200,9 +227,52 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        protected override Ruleset CreateRuleset() => new ManiaRuleset();
+        #endregion
 
-        #region Mock classes
+        #region Test classes
+
+        private class TestFrameStableClock : IFrameStableClock
+        {
+            public TestFrameStableClock(IClock source, double startTime = 0)
+            {
+                this.source = source;
+                StartTime = startTime;
+
+                if (source is ManualClock manualClock)
+                {
+                    manualClock.CurrentTime = startTime;
+                }
+            }
+
+            public double CurrentTime => source.CurrentTime;
+            public double Rate => source.Rate;
+            public bool IsRunning => source.IsRunning;
+
+            private IClock source;
+
+            public void ProcessFrame()
+            {
+                if (source is ManualClock manualClock)
+                {
+                    manualClock.CurrentTime += 1000 * Rate;
+                }
+
+                TimeInfo = new FrameTimeInfo
+                {
+                    Elapsed = 1000 * Rate,
+                    Current = CurrentTime
+                };
+            }
+
+            public double ElapsedFrameTime => TimeInfo.Elapsed;
+            public double FramesPerSecond => 1 / ElapsedFrameTime * 1000;
+            public FrameTimeInfo TimeInfo { get; private set; }
+
+            public double? StartTime { get; }
+            public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
+            public IBindable<bool> IsCatchingUp => new Bindable<bool>();
+            public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
+        }
 
         private class ManualInputListener : ClicksPerSecondCalculator.InputListener
         {
@@ -214,108 +284,54 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private class MockFrameBasedClock : ManualClock, IFrameBasedClock
+#nullable disable
+
+        [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
+        private class TestDrawableRuleset : DrawableRuleset
         {
-            public const double FRAME_INTERVAL = 1000;
-            public bool Backwards;
+            public override IEnumerable<HitObject> Objects => Enumerable.Empty<HitObject>();
 
-            public MockFrameBasedClock()
+            public override event Action<JudgementResult> NewResult
             {
-                Rate = 1;
-                IsRunning = true;
+                add => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
+                remove => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
             }
 
-            public void ProcessFrame()
+            public override event Action<JudgementResult> RevertResult
             {
-                CurrentTime += FRAME_INTERVAL * Rate * (Backwards ? -1 : 1);
-                TimeInfo = new FrameTimeInfo
-                {
-                    Current = CurrentTime,
-                    Elapsed = FRAME_INTERVAL * Rate * (Backwards ? -1 : 1)
-                };
+                add => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
+                remove => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
             }
 
-            public void Seek(double time)
-            {
-                TimeInfo = new FrameTimeInfo
-                {
-                    Elapsed = time - CurrentTime,
-                    Current = CurrentTime = time
-                };
-            }
-
-            public double ElapsedFrameTime => TimeInfo.Elapsed;
-            public double FramesPerSecond => 1 / FRAME_INTERVAL;
-            public FrameTimeInfo TimeInfo { get; private set; }
-        }
-
-        private class MockFrameStableClock : IGameplayClock, IFrameStableClock
-        {
-            internal readonly IFrameBasedClock UnderlyingClock;
-
-            public readonly BindableBool IsPaused = new BindableBool();
-
-            public MockFrameStableClock(MockFrameBasedClock underlyingClock)
-            {
-                UnderlyingClock = underlyingClock;
-            }
-
-            public void Seek(double time) => (UnderlyingClock as MockFrameBasedClock)?.Seek(time);
-
-            public IBindable<bool> IsCatchingUp => new Bindable<bool>();
-            public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
-            public double CurrentTime => UnderlyingClock.CurrentTime;
-            public double Rate => UnderlyingClock.Rate;
-            public bool IsRunning => UnderlyingClock.IsRunning;
-            public void ProcessFrame() => UnderlyingClock.ProcessFrame();
-
-            public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
-            public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
-            public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
-            public double TrueGameplayRate => UnderlyingClock.Rate;
-            public double? StartTime => 0;
-            public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
-            IBindable<bool> IGameplayClock.IsPaused => IsPaused;
-        }
-
-        private class MockDrawableRuleset : DrawableRuleset
-        {
-            public MockDrawableRuleset(Ruleset ruleset, IFrameStableClock clock)
-                : base(ruleset)
-            {
-                FrameStableClock = clock;
-            }
-
-#pragma warning disable CS0067
-            public override event Action<JudgementResult>? NewResult;
-            public override event Action<JudgementResult>? RevertResult;
-#pragma warning restore CS0067
-            public override Playfield? Playfield => null;
-            public override Container? Overlays => null;
-            public override Container? FrameStableComponents => null;
+            public override Playfield Playfield => null;
+            public override Container Overlays => null;
+            public override Container FrameStableComponents => null;
             public override IFrameStableClock FrameStableClock { get; }
 
             internal override bool FrameStablePlayback { get; set; }
             public override IReadOnlyList<Mod> Mods => Array.Empty<Mod>();
-            public override IEnumerable<HitObject> Objects => Array.Empty<HitObject>();
+
             public override double GameplayStartTime => 0;
-            public override GameplayCursorContainer? Cursor => null;
+            public override GameplayCursorContainer Cursor => null;
 
-            public override void SetReplayScore(Score replayScore)
+            public TestDrawableRuleset()
+                : base(new OsuRuleset())
             {
             }
 
-            public override void SetRecordTarget(Score score)
+            public TestDrawableRuleset(IFrameStableClock frameStableClock)
+                : this()
             {
+                FrameStableClock = frameStableClock;
             }
 
-            public override void RequestResume(Action continueResume)
-            {
-            }
+            public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();
 
-            public override void CancelResume()
-            {
-            }
+            public override void SetRecordTarget(Score score) => throw new NotImplementedException();
+
+            public override void RequestResume(Action continueResume) => throw new NotImplementedException();
+
+            public override void CancelResume() => throw new NotImplementedException();
         }
 
         #endregion

From b5970495242d9555fad30c52a33b1e66f3f3a4e9 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Mon, 22 Aug 2022 10:47:37 +0200
Subject: [PATCH 089/709] Code cleanup for CPS tests

- Remove null-forgiving operator usages
- Fix code quality issues mentionned by NVika
---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index 375726dd9a..137ab7acdb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -27,11 +27,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneClicksPerSecond : OsuTestScene
     {
-        private DependencyProvidingContainer? dependencyContainer;
-        private ClicksPerSecondCalculator? calculator;
+        private DependencyProvidingContainer dependencyContainer = null!;
+        private ClicksPerSecondCalculator calculator = null!;
         private ManualInputListener? listener;
-        private GameplayClockContainer? gameplayClockContainer;
-        private ManualClock? manualClock;
+        private GameplayClockContainer gameplayClockContainer = null!;
+        private ManualClock manualClock = null!;
         private DrawableRuleset? drawableRuleset;
         private IFrameStableClock? frameStableClock;
 
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 seek(i * 10000);
                 advanceForwards(2);
                 int kps = i + 1;
-                AddAssert($"{kps} KPS", () => calculator!.Value == kps);
+                AddAssert($"{kps} KPS", () => calculator.Value == kps);
             }
         }
 
@@ -95,14 +95,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 changeRate(i);
                 double rate = i;
-                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator!.Value, 10 * rate, 0.5));
+                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator.Value, 10 * rate, 0.5));
             }
 
             for (double i = 1; i >= 0.5; i -= 0.25)
             {
                 changeRate(i);
                 double rate = i;
-                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator!.Value, 10 * rate, 0.5));
+                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator.Value, 10 * rate, 0.5));
             }
         }
 
@@ -115,17 +115,17 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
             seek(1000);
 
-            AddAssert("KPS = 10", () => calculator!.Value == 10);
+            AddAssert("KPS = 10", () => calculator.Value == 10);
 
             AddStep("Create delayed inputs", () => addInputs(generateConsistentKps(10, 50)));
             seek(1000);
-            AddAssert("KPS didn't changed", () => calculator!.Value == 10);
+            AddAssert("KPS didn't changed", () => calculator.Value == 10);
         }
 
         private void seekAllClocks(double time)
         {
-            gameplayClockContainer?.Seek(time);
-            manualClock!.CurrentTime = time;
+            gameplayClockContainer.Seek(time);
+            manualClock.CurrentTime = time;
         }
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();
@@ -136,8 +136,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create calculator", () =>
             {
-                Debug.Assert(dependencyContainer?.Dependencies.Get(typeof(DrawableRuleset)) is DrawableRuleset);
-                dependencyContainer!.Children = new Drawable[]
+                dependencyContainer.Children = new Drawable[]
                 {
                     calculator = new ClicksPerSecondCalculator(),
                     new DependencyProvidingContainer
@@ -152,18 +151,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                         }
                     }
                 };
-                calculator!.Listener = listener = new ManualInputListener(calculator!);
+                calculator.Listener = listener = new ManualInputListener(calculator);
             });
         }
 
         private void seek(double time) => AddStep($"Seek clocks to {time}ms", () => seekAllClocks(time));
 
-        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () => manualClock!.Rate = rate);
+        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () => manualClock.Rate = rate);
 
         private void advanceForwards(double time) =>
             AddStep($"Advance clocks {time} seconds forward.", () =>
             {
-                gameplayClockContainer!.Seek(gameplayClockContainer.CurrentTime + time * manualClock!.Rate);
+                gameplayClockContainer.Seek(gameplayClockContainer.CurrentTime + time * manualClock.Rate);
 
                 for (int i = 0; i < time; i++)
                 {
@@ -173,8 +172,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void startClock() => AddStep("Start clocks", () =>
         {
-            gameplayClockContainer?.Start();
-            manualClock!.Rate = 1;
+            gameplayClockContainer.Start();
+            manualClock.Rate = 1;
         });
 
         #endregion
@@ -183,7 +182,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void addInputs(IEnumerable<double> inputs)
         {
-            Debug.Assert(manualClock != null && listener != null && gameplayClockContainer != null);
             if (!inputs.Any()) return;
 
             double baseTime = gameplayClockContainer.CurrentTime;
@@ -191,7 +189,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             foreach (double timestamp in inputs)
             {
                 seekAllClocks(timestamp);
-                listener.AddInput();
+                listener?.AddInput();
             }
 
             seekAllClocks(baseTime);
@@ -199,7 +197,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private IEnumerable<double> generateGraduallyIncreasingKps()
         {
-            IEnumerable<double>? final = null;
+            IEnumerable<double> final = null!;
 
             for (int i = 1; i <= 10; i++)
             {
@@ -211,10 +209,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                     continue;
                 }
 
-                final = final!.Concat(currentKps);
+                final = final.Concat(currentKps);
             }
 
-            return final!;
+            return final;
         }
 
         private IEnumerable<double> generateConsistentKps(double kps, double start = 0, double duration = 10)
@@ -236,7 +234,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             public TestFrameStableClock(IClock source, double startTime = 0)
             {
                 this.source = source;
-                StartTime = startTime;
 
                 if (source is ManualClock manualClock)
                 {
@@ -248,7 +245,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public double Rate => source.Rate;
             public bool IsRunning => source.IsRunning;
 
-            private IClock source;
+            private readonly IClock source;
 
             public void ProcessFrame()
             {
@@ -268,7 +265,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             public double FramesPerSecond => 1 / ElapsedFrameTime * 1000;
             public FrameTimeInfo TimeInfo { get; private set; }
 
-            public double? StartTime { get; }
             public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
             public IBindable<bool> IsCatchingUp => new Bindable<bool>();
             public IBindable<bool> WaitingOnFrames => new Bindable<bool>();

From 1098e24c40afef4ee684706d2050e0e9dae9bd61 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 22 Aug 2022 14:24:52 +0100
Subject: [PATCH 090/709] Improved UprightUnscaledContainer

---
 osu.Game/Extensions/DrawableExtensions.cs     | 36 ----------
 .../Graphics/Containers/GrowToFitContainer.cs | 21 ------
 .../Containers/UprightUnscaledContainer.cs    | 66 ++++++++++++++++++-
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 33 +++-------
 4 files changed, 73 insertions(+), 83 deletions(-)
 delete mode 100644 osu.Game/Graphics/Containers/GrowToFitContainer.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 320b9d7996..35f2d61437 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -8,7 +8,6 @@ using osu.Game.Configuration;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 using osuTK;
-using System;
 
 namespace osu.Game.Extensions
 {
@@ -80,40 +79,5 @@ namespace osu.Game.Extensions
                     container.Add(child.CreateInstance());
             }
         }
-
-        /// <summary>
-        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
-        /// </summary>
-        /// <param name="drawable">The drawable.</param>
-        public static void KeepUprightAndUnscaled(this Drawable drawable)
-        {
-            // Decomposes the inverse of the parent FrawInfo.Matrix into rotation, shear and scale.
-            var parentMatrix = drawable.Parent.DrawInfo.Matrix;
-            parentMatrix.Transpose();
-
-            // Remove Translation.
-            parentMatrix.M13 = 0.0f;
-            parentMatrix.M23 = 0.0f;
-
-            Matrix3 C = parentMatrix.Inverted();
-
-            // Extract the rotation.
-            float angle = MathF.Atan2(C.M21, C.M11);
-            drawable.Rotation = MathHelper.RadiansToDegrees(angle);
-
-            // Remove rotation from the C matrix so that it only contains shear and scale.
-            Matrix3 m = Matrix3.CreateRotationZ(-angle);
-            m.Transpose();
-            C = m * C;
-
-            // Extract shear and scale.
-            float alpha, sx, sy;
-            sx = C.M11;
-            sy = C.M22;
-            alpha = C.M12 / C.M22;
-
-            drawable.Scale = new Vector2(sx, sy);
-            drawable.Shear = new Vector2(-alpha, 0);
-        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/GrowToFitContainer.cs b/osu.Game/Graphics/Containers/GrowToFitContainer.cs
deleted file mode 100644
index 9b4ad0dba9..0000000000
--- a/osu.Game/Graphics/Containers/GrowToFitContainer.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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 osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Graphics.Containers
-{
-    /// <summary>
-    /// A container that grows in size to fit its child and retains its size when its child shrinks
-    /// </summary>
-    public class GrowToFitContainer : Container
-    {
-        protected override void Update()
-        {
-            base.Update();
-            Height = Math.Max(Child.Height, Height);
-            Width = Math.Max(Child.Width, Width);
-        }
-    }
-}
diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index cdb839fdec..b6c3b56c4a 100644
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -4,6 +4,8 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
+using osuTK;
+using System;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -12,21 +14,81 @@ namespace osu.Game.Graphics.Containers
     /// </summary>
     public class UprightUnscaledContainer : Container
     {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
         public UprightUnscaledContainer()
         {
+            InternalChild = content = new GrowToFitContainer();
             AddLayout(layout);
         }
 
-        private LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
 
         protected override void Update()
         {
             base.Update();
+
             if (!layout.IsValid)
             {
-                Extensions.DrawableExtensions.KeepUprightAndUnscaled(this);
+                keepUprightAndUnscaled();
                 layout.Validate();
             }
         }
+
+        /// <summary>
+        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
+        /// </summary>
+        private void keepUprightAndUnscaled()
+        {
+            // Decomposes the inverse of the parent FrawInfo.Matrix into rotation, shear and scale.
+            var parentMatrix = Parent.DrawInfo.Matrix;
+
+            // Remove Translation.
+            parentMatrix.M31 = 0.0f;
+            parentMatrix.M32 = 0.0f;
+
+            Matrix3 reversedParrent = parentMatrix.Inverted();
+
+            // Extract the rotation.
+            float angle = MathF.Atan2(reversedParrent.M12, reversedParrent.M11);
+            Rotation = MathHelper.RadiansToDegrees(angle);
+
+            // Remove rotation from the C matrix so that it only contains shear and scale.
+            Matrix3 m = Matrix3.CreateRotationZ(-angle);
+            reversedParrent *= m;
+
+            // Extract shear and scale.
+            float sx = reversedParrent.M11;
+            float sy = reversedParrent.M22;
+            float alpha = reversedParrent.M21 / reversedParrent.M22;
+
+            Scale = new Vector2(sx, sy);
+            Shear = new Vector2(-alpha, 0);
+        }
+
+        /// <summary>
+        /// A container that grows in size to fit its children and retains its size when its children shrink
+        /// </summary>
+        private class GrowToFitContainer : Container
+        {
+            protected override Container<Drawable> Content => content;
+            private readonly Container content;
+
+            public GrowToFitContainer()
+            {
+                InternalChild = content = new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                };
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                Height = Math.Max(content.Height, Height);
+                Width = Math.Max(content.Width, Width);
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 069492fd80..c4cdc0cb29 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -60,17 +60,12 @@ namespace osu.Game.Screens.Play.HUD
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
-                        Child = new GrowToFitContainer
+                        Child = timeCurrent = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Child = timeCurrent = new OsuSpriteText
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Colour = colours.BlueLighter,
-                                Font = OsuFont.Numeric,
-                            }
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
                         }
                     }
                 },
@@ -84,17 +79,12 @@ namespace osu.Game.Screens.Play.HUD
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
-                        Child = new GrowToFitContainer
+                        Child = progress = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Child = progress = new OsuSpriteText
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Colour = colours.BlueLighter,
-                                Font = OsuFont.Numeric,
-                             }
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
                         }
                     }
                 },
@@ -108,17 +98,12 @@ namespace osu.Game.Screens.Play.HUD
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
-                        Child = new GrowToFitContainer
+                        Child = timeLeft = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
-                            Child = timeLeft = new OsuSpriteText
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                Colour = colours.BlueLighter,
-                                Font = OsuFont.Numeric,
-                            }
+                            Colour = colours.BlueLighter,
+                            Font = OsuFont.Numeric,
                         }
                     }
                 }

From f3847b90fddaa6418c457a68ddd2912f637b0443 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Aug 2022 19:36:01 +0900
Subject: [PATCH 091/709] Tidy up attach logic

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs     |  7 ++++---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 23 +++++++++------------
 osu.Game/Screens/Play/HUDOverlay.cs         |  7 +++++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 02df4d8fb3..73acb1759f 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.UI
     /// Displays an interactive ruleset gameplay instance.
     /// </summary>
     /// <typeparam name="TObject">The type of HitObject contained by this DrawableRuleset.</typeparam>
-    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachKeyCounter
+    public abstract class DrawableRuleset<TObject> : DrawableRuleset, IProvideCursor, ICanAttachHUDPieces
         where TObject : HitObject
     {
         public override event Action<JudgementResult> NewResult;
@@ -339,9 +339,10 @@ namespace osu.Game.Rulesets.UI
         public abstract DrawableHitObject<TObject> CreateDrawableRepresentation(TObject h);
 
         public void Attach(KeyCounterDisplay keyCounter) =>
-            (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(keyCounter);
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(keyCounter);
 
-        public void Attach(ClicksPerSecondCalculator calculator) => (KeyBindingInputManager as ICanAttachKeyCounter)?.Attach(calculator);
+        public void Attach(ClicksPerSecondCalculator calculator) =>
+            (KeyBindingInputManager as ICanAttachHUDPieces)?.Attach(calculator);
 
         /// <summary>
         /// Creates a key conversion input manager. An exception will be thrown if a valid <see cref="RulesetInputManager{T}"/> is not returned.
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 4b7ce22cfc..401ebbfd74 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -25,7 +25,7 @@ using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
+    public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachHUDPieces, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
         public readonly KeyBindingContainer<T> KeyBindingContainer;
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.UI
                                                    .Select(action => new KeyCounterAction<T>(action)));
         }
 
-        public class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
+        private class ActionReceptor : KeyCounterDisplay.Receptor, IKeyBindingHandler<T>
         {
             public ActionReceptor(KeyCounterDisplay target)
                 : base(target)
@@ -191,8 +191,6 @@ namespace osu.Game.Rulesets.UI
 
         public void Attach(ClicksPerSecondCalculator calculator)
         {
-            if (calculator == null) return;
-
             var listener = new ActionListener(calculator);
 
             KeyBindingContainer.Add(listener);
@@ -200,23 +198,22 @@ namespace osu.Game.Rulesets.UI
             calculator.Listener = listener;
         }
 
-        public class ActionListener : ClicksPerSecondCalculator.InputListener, IKeyBindingHandler<T>
+        private class ActionListener : ClicksPerSecondCalculator.InputListener, IKeyBindingHandler<T>
         {
+            public ActionListener(ClicksPerSecondCalculator calculator)
+                : base(calculator)
+            {
+            }
+
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
                 Calculator.AddTimestamp();
-
                 return false;
             }
 
             public void OnReleased(KeyBindingReleaseEvent<T> e)
             {
             }
-
-            public ActionListener(ClicksPerSecondCalculator calculator)
-                : base(calculator)
-            {
-            }
         }
 
         #endregion
@@ -256,10 +253,10 @@ namespace osu.Game.Rulesets.UI
     }
 
     /// <summary>
-    /// Supports attaching a <see cref="KeyCounterDisplay"/>.
+    /// Supports attaching various HUD pieces.
     /// Keys will be populated automatically and a receptor will be injected inside.
     /// </summary>
-    public interface ICanAttachKeyCounter
+    public interface ICanAttachHUDPieces
     {
         void Attach(KeyCounterDisplay keyCounter);
         void Attach(ClicksPerSecondCalculator calculator);
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index b27efaf13a..f9f3693385 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -264,8 +264,11 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindDrawableRuleset(DrawableRuleset drawableRuleset)
         {
-            (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
-            (drawableRuleset as ICanAttachKeyCounter)?.Attach(clicksPerSecondCalculator);
+            if (drawableRuleset is ICanAttachHUDPieces attachTarget)
+            {
+                attachTarget.Attach(KeyCounter);
+                attachTarget.Attach(clicksPerSecondCalculator);
+            }
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
         }

From 5cddc7ed1f8fadccedccc4b6efe0a836d1ec3037 Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Wed, 24 Aug 2022 17:12:52 +0200
Subject: [PATCH 092/709] Code cleanup (CPS)

---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 31 ++----
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 10 +-
 .../ClicksPerSecondCalculator.cs              | 96 ++++++-------------
 .../ClicksPerSecond/ClicksPerSecondCounter.cs |  6 +-
 4 files changed, 42 insertions(+), 101 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index 137ab7acdb..a140460251 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private DependencyProvidingContainer dependencyContainer = null!;
         private ClicksPerSecondCalculator calculator = null!;
-        private ManualInputListener? listener;
         private GameplayClockContainer gameplayClockContainer = null!;
         private ManualClock manualClock = null!;
         private DrawableRuleset? drawableRuleset;
@@ -151,7 +150,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         }
                     }
                 };
-                calculator.Listener = listener = new ManualInputListener(calculator);
             });
         }
 
@@ -189,7 +187,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             foreach (double timestamp in inputs)
             {
                 seekAllClocks(timestamp);
-                listener?.AddInput();
+                calculator.AddTimestamp();
             }
 
             seekAllClocks(baseTime);
@@ -270,18 +268,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
         }
 
-        private class ManualInputListener : ClicksPerSecondCalculator.InputListener
-        {
-            public void AddInput() => Calculator.AddTimestamp();
-
-            public ManualInputListener(ClicksPerSecondCalculator calculator)
-                : base(calculator)
-            {
-            }
-        }
-
-#nullable disable
-
         [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
         private class TestDrawableRuleset : DrawableRuleset
         {
@@ -299,24 +285,19 @@ namespace osu.Game.Tests.Visual.Gameplay
                 remove => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
             }
 
-            public override Playfield Playfield => null;
-            public override Container Overlays => null;
-            public override Container FrameStableComponents => null;
+            public override Playfield Playfield => null!;
+            public override Container Overlays => null!;
+            public override Container FrameStableComponents => null!;
             public override IFrameStableClock FrameStableClock { get; }
 
             internal override bool FrameStablePlayback { get; set; }
             public override IReadOnlyList<Mod> Mods => Array.Empty<Mod>();
 
             public override double GameplayStartTime => 0;
-            public override GameplayCursorContainer Cursor => null;
-
-            public TestDrawableRuleset()
-                : base(new OsuRuleset())
-            {
-            }
+            public override GameplayCursorContainer Cursor => null!;
 
             public TestDrawableRuleset(IFrameStableClock frameStableClock)
-                : this()
+                : base(new OsuRuleset())
             {
                 FrameStableClock = frameStableClock;
             }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 401ebbfd74..dcd2c4fb5d 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -194,20 +194,20 @@ namespace osu.Game.Rulesets.UI
             var listener = new ActionListener(calculator);
 
             KeyBindingContainer.Add(listener);
-
-            calculator.Listener = listener;
         }
 
-        private class ActionListener : ClicksPerSecondCalculator.InputListener, IKeyBindingHandler<T>
+        private class ActionListener : Component, IKeyBindingHandler<T>
         {
+            private readonly ClicksPerSecondCalculator calculator;
+
             public ActionListener(ClicksPerSecondCalculator calculator)
-                : base(calculator)
             {
+                this.calculator = calculator;
             }
 
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                Calculator.AddTimestamp();
+                calculator.AddTimestamp();
                 return false;
             }
 
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index d9c3c6ffec..20ac923b82 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -1,12 +1,10 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
@@ -15,89 +13,53 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
     {
         private readonly List<double> timestamps;
 
-        private InputListener? listener;
+        [Resolved]
+        private IGameplayClock gameplayClock { get; set; } = null!;
 
         [Resolved]
-        private IGameplayClock? gameplayClock { get; set; }
+        private DrawableRuleset drawableRuleset { get; set; } = null!;
 
-        [Resolved(canBeNull: true)]
-        private DrawableRuleset? drawableRuleset { get; set; }
+        private double rate;
 
-        public InputListener Listener
-        {
-            set
-            {
-                onResetRequested?.Invoke();
-                listener = value;
-            }
-        }
+        // The latest timestamp GC seeked. Does not affect normal gameplay
+        // but prevents duplicate inputs on replays.
+        private double latestTime = double.NegativeInfinity;
 
-        private event Action? onResetRequested;
-
-        private IClock? workingClock => drawableRuleset?.FrameStableClock;
-
-        private double baseRate;
-
-        private double rate
-        {
-            get
-            {
-                if (gameplayClock?.TrueGameplayRate > 0)
-                {
-                    baseRate = gameplayClock.TrueGameplayRate;
-                }
-
-                return baseRate;
-            }
-        }
-
-        private double maxTime = double.NegativeInfinity;
-
-        public bool Ready => workingClock != null && gameplayClock != null && listener != null;
-        public int Value => timestamps.Count(isTimestampWithinSpan);
+        public int Value { get; private set; }
 
         public ClicksPerSecondCalculator()
         {
             RelativeSizeAxes = Axes.Both;
             timestamps = new List<double>();
-            onResetRequested += cleanUp;
         }
 
-        private void cleanUp()
+        protected override void Update()
         {
-            timestamps.Clear();
-            maxTime = double.NegativeInfinity;
+            base.Update();
+
+            // When pausing in replays (using the space bar) GC.TrueGameplayRate returns 0
+            // To prevent CPS value being 0, we store and use the last non-zero TrueGameplayRate
+            if (gameplayClock.TrueGameplayRate > 0)
+            {
+                rate = gameplayClock.TrueGameplayRate;
+            }
+
+            Value = timestamps.Count(timestamp =>
+            {
+                double window = 1000 * rate;
+                double relativeTime = drawableRuleset.FrameStableClock.CurrentTime - timestamp;
+                return relativeTime > 0 && relativeTime <= window;
+            });
         }
 
         public void AddTimestamp()
         {
-            if (workingClock == null) return;
-
-            if (workingClock.CurrentTime >= maxTime)
+            // Discard inputs if current gameplay time is not the latest
+            // to prevent duplicate inputs
+            if (drawableRuleset.FrameStableClock.CurrentTime >= latestTime)
             {
-                timestamps.Add(workingClock.CurrentTime);
-                maxTime = workingClock.CurrentTime;
-            }
-        }
-
-        private bool isTimestampWithinSpan(double timestamp)
-        {
-            if (workingClock == null) return false;
-
-            double span = 1000 * rate;
-            double relativeTime = workingClock.CurrentTime - timestamp;
-            return relativeTime > 0 && relativeTime <= span;
-        }
-
-        public abstract class InputListener : Component
-        {
-            protected ClicksPerSecondCalculator Calculator;
-
-            protected InputListener(ClicksPerSecondCalculator calculator)
-            {
-                RelativeSizeAxes = Axes.Both;
-                Depth = float.MinValue;
-                Calculator = calculator;
+                timestamps.Add(drawableRuleset.FrameStableClock.CurrentTime);
+                latestTime = drawableRuleset.FrameStableClock.CurrentTime;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
index 3ff06d5217..243d8ed1e8 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
@@ -16,9 +16,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
     public class ClicksPerSecondCounter : RollingCounter<int>, ISkinnableDrawable
     {
-        private const float alpha_when_invalid = 0.3f;
-
-        [Resolved(canBeNull: false)]
+        [Resolved]
         private ClicksPerSecondCalculator calculator { get; set; } = null!;
 
         protected override double RollingDuration => 350;
@@ -40,7 +38,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
         {
             base.Update();
 
-            Current.Value = calculator.Ready ? calculator.Value : 0;
+            Current.Value = calculator.Value;
         }
 
         protected override IHasText CreateText() => new TextComponent();

From 29f3724047ec5e457a89f797f20689ac2e87ef54 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 26 Aug 2022 01:28:57 +0100
Subject: [PATCH 093/709] Changed UprightUnscaledContainer to
 UprightUnstretchedContainer.

---
 .../Containers/UprightUnscaledContainer.cs    | 66 ++++++++++++++++---
 1 file changed, 58 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index b6c3b56c4a..c64e4ee2b7 100644
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -12,13 +12,24 @@ namespace osu.Game.Graphics.Containers
     /// <summary>
     /// A container that prevents itself and its children from getting rotated, scaled or flipped with its Parent.
     /// </summary>
-    public class UprightUnscaledContainer : Container
+    public class UprightUnstretchedContainer : Container
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public UprightUnscaledContainer()
+        /// <summary>
+        /// Controls how much this container scales compared to its parent (default is 1.0f).
+        /// </summary>
+        public float ScalingFactor { get; set; }
+
+        /// <summary>
+        /// Controls the scaling of this container.
+        /// </summary>
+        public ScaleMode Scaling { get; set; }
+
+        public UprightUnstretchedContainer()
         {
+            Scaling = ScaleMode.NoScaling;
             InternalChild = content = new GrowToFitContainer();
             AddLayout(layout);
         }
@@ -31,7 +42,7 @@ namespace osu.Game.Graphics.Containers
 
             if (!layout.IsValid)
             {
-                keepUprightAndUnscaled();
+                keepUprightAndUnstretched();
                 layout.Validate();
             }
         }
@@ -39,7 +50,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
         /// </summary>
-        private void keepUprightAndUnscaled()
+        private void keepUprightAndUnstretched()
         {
             // Decomposes the inverse of the parent FrawInfo.Matrix into rotation, shear and scale.
             var parentMatrix = Parent.DrawInfo.Matrix;
@@ -58,13 +69,32 @@ namespace osu.Game.Graphics.Containers
             Matrix3 m = Matrix3.CreateRotationZ(-angle);
             reversedParrent *= m;
 
-            // Extract shear and scale.
+            // Extract shear.
+            float alpha = reversedParrent.M21 / reversedParrent.M22;
+            Shear = new Vector2(-alpha, 0);
+
+            // Etract scale.
             float sx = reversedParrent.M11;
             float sy = reversedParrent.M22;
-            float alpha = reversedParrent.M21 / reversedParrent.M22;
 
-            Scale = new Vector2(sx, sy);
-            Shear = new Vector2(-alpha, 0);
+            Vector3 parentScale = parentMatrix.ExtractScale();
+
+            float usedScale = 1.0f;
+
+            switch (Scaling)
+            {
+                case ScaleMode.Horizontal:
+                    usedScale = parentScale.X;
+                    break;
+
+                case ScaleMode.Vertical:
+                    usedScale = parentScale.Y;
+                    break;
+            }
+
+            usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
+
+            Scale = new Vector2(sx * usedScale, sy * usedScale);
         }
 
         /// <summary>
@@ -91,4 +121,24 @@ namespace osu.Game.Graphics.Containers
             }
         }
     }
+
+    public enum ScaleMode
+    {
+        /// <summary>
+        /// Prevent this container from scaling.
+        /// </summary>
+        NoScaling,
+
+        /// <summary>
+        /// Scale This container (vertically and horizontally) with the vertical axis of its parent
+        /// preserving the aspect ratio of the container.
+        /// </summary>
+        Vertical,
+
+        /// <summary>
+        /// Scales This container (vertically and horizontally) with the horizontal axis of its parent
+        /// preserving the aspect ratio of the container.
+        /// </summary>
+        Horizontal,
+    }
 }

From d98357aa5748d5a6ee400925684dc45a7bcdaec6 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 26 Aug 2022 01:30:44 +0100
Subject: [PATCH 094/709] Made text inside SongProgressInfo scale.

---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index c4cdc0cb29..83fe8b14c3 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -55,11 +55,13 @@ namespace osu.Game.Screens.Play.HUD
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnscaledContainer
+                    Child = new UprightUnstretchedContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
+                        Scaling = ScaleMode.Vertical,
+                        ScalingFactor = 0.5f,
                         Child = timeCurrent = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
@@ -74,11 +76,13 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnscaledContainer
+                    Child = new UprightUnstretchedContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
+                        Scaling = ScaleMode.Vertical,
+                        ScalingFactor = 0.5f,
                         Child = progress = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,
@@ -93,11 +97,13 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnscaledContainer
+                    Child = new UprightUnstretchedContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
+                        Scaling = ScaleMode.Vertical,
+                        ScalingFactor = 0.5f,
                         Child = timeLeft = new OsuSpriteText
                         {
                             Origin = Anchor.Centre,

From 23efec65054946ca62f6b7f3b1473f9b55258c5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Aug 2022 15:56:47 +0900
Subject: [PATCH 095/709] Fix naming and comment typos

---
 .../Containers/UprightUnscaledContainer.cs    | 19 ++++++++-----------
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs |  6 +++---
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index c64e4ee2b7..4d9630052a 100644
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -10,9 +10,9 @@ using System;
 namespace osu.Game.Graphics.Containers
 {
     /// <summary>
-    /// A container that prevents itself and its children from getting rotated, scaled or flipped with its Parent.
+    /// A container that reverts any rotation (and optionally scale) applied by its direct parent.
     /// </summary>
-    public class UprightUnstretchedContainer : Container
+    public class UprightAspectMaintainingContainer : Container
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
@@ -20,16 +20,15 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Controls how much this container scales compared to its parent (default is 1.0f).
         /// </summary>
-        public float ScalingFactor { get; set; }
+        public float ScalingFactor { get; set; } = 1;
 
         /// <summary>
         /// Controls the scaling of this container.
         /// </summary>
-        public ScaleMode Scaling { get; set; }
+        public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
 
-        public UprightUnstretchedContainer()
+        public UprightAspectMaintainingContainer()
         {
-            Scaling = ScaleMode.NoScaling;
             InternalChild = content = new GrowToFitContainer();
             AddLayout(layout);
         }
@@ -52,7 +51,7 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         private void keepUprightAndUnstretched()
         {
-            // Decomposes the inverse of the parent FrawInfo.Matrix into rotation, shear and scale.
+            // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
             var parentMatrix = Parent.DrawInfo.Matrix;
 
             // Remove Translation.
@@ -130,14 +129,12 @@ namespace osu.Game.Graphics.Containers
         NoScaling,
 
         /// <summary>
-        /// Scale This container (vertically and horizontally) with the vertical axis of its parent
-        /// preserving the aspect ratio of the container.
+        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
         /// </summary>
         Vertical,
 
         /// <summary>
-        /// Scales This container (vertically and horizontally) with the horizontal axis of its parent
-        /// preserving the aspect ratio of the container.
+        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
         /// </summary>
         Horizontal,
     }
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 83fe8b14c3..36ec16a607 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnstretchedContainer
+                    Child = new UprightAspectMaintainingContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnstretchedContainer
+                    Child = new UprightAspectMaintainingContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Play.HUD
                     Origin = Anchor.CentreRight,
                     Anchor = Anchor.CentreRight,
                     AutoSizeAxes = Axes.Both,
-                    Child = new UprightUnstretchedContainer
+                    Child = new UprightAspectMaintainingContainer
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,

From a40355186a1c8434535a7ccf286ee92e82c2d39d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Aug 2022 16:00:20 +0900
Subject: [PATCH 096/709] Tidy up constructor field initialisation

---
 osu.Game/Graphics/Containers/UprightUnscaledContainer.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index 4d9630052a..d2cd7d3373 100644
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -14,8 +14,7 @@ namespace osu.Game.Graphics.Containers
     /// </summary>
     public class UprightAspectMaintainingContainer : Container
     {
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
+        protected override Container<Drawable> Content { get; }
 
         /// <summary>
         /// Controls how much this container scales compared to its parent (default is 1.0f).
@@ -27,14 +26,14 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
 
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
+
         public UprightAspectMaintainingContainer()
         {
-            InternalChild = content = new GrowToFitContainer();
+            AddInternal(Content = new GrowToFitContainer());
             AddLayout(layout);
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
-
         protected override void Update()
         {
             base.Update();

From d6359b00ad5022062f9469cb2103d4229ce38d88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Aug 2022 19:20:36 +0900
Subject: [PATCH 097/709] Fix filename mismatch

---
 .../UprightAspectMaintainingContainer.cs      | 122 ++++++++++++++++++
 .../Containers/UprightUnscaledContainer.cs    | 117 -----------------
 2 files changed, 122 insertions(+), 117 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs

diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
new file mode 100644
index 0000000000..e556117bc0
--- /dev/null
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -0,0 +1,122 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
+using osuTK;
+
+namespace osu.Game.Graphics.Containers
+{
+    /// <summary>
+    /// A container that reverts any rotation (and optionally scale) applied by its direct parent.
+    /// </summary>
+    public class UprightAspectMaintainingContainer : Container
+    {
+        protected override Container<Drawable> Content { get; }
+
+        /// <summary>
+        /// Controls how much this container scales compared to its parent (default is 1.0f).
+        /// </summary>
+        public float ScalingFactor { get; set; } = 1;
+
+        /// <summary>
+        /// Controls the scaling of this container.
+        /// </summary>
+        public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
+
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
+
+        public UprightAspectMaintainingContainer()
+        {
+            AddInternal(Content = new GrowToFitContainer());
+            AddLayout(layout);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!layout.IsValid)
+            {
+                keepUprightAndUnstretched();
+                layout.Validate();
+            }
+        }
+
+        /// <summary>
+        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
+        /// </summary>
+        private void keepUprightAndUnstretched()
+        {
+            // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
+            var parentMatrix = Parent.DrawInfo.Matrix;
+
+            // Remove Translation.
+            parentMatrix.M31 = 0.0f;
+            parentMatrix.M32 = 0.0f;
+
+            Matrix3 reversedParrent = parentMatrix.Inverted();
+
+            // Extract the rotation.
+            float angle = MathF.Atan2(reversedParrent.M12, reversedParrent.M11);
+            Rotation = MathHelper.RadiansToDegrees(angle);
+
+            // Remove rotation from the C matrix so that it only contains shear and scale.
+            Matrix3 m = Matrix3.CreateRotationZ(-angle);
+            reversedParrent *= m;
+
+            // Extract shear.
+            float alpha = reversedParrent.M21 / reversedParrent.M22;
+            Shear = new Vector2(-alpha, 0);
+
+            // Etract scale.
+            float sx = reversedParrent.M11;
+            float sy = reversedParrent.M22;
+
+            Vector3 parentScale = parentMatrix.ExtractScale();
+
+            float usedScale = 1.0f;
+
+            switch (Scaling)
+            {
+                case ScaleMode.Horizontal:
+                    usedScale = parentScale.X;
+                    break;
+
+                case ScaleMode.Vertical:
+                    usedScale = parentScale.Y;
+                    break;
+            }
+
+            usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
+
+            Scale = new Vector2(sx * usedScale, sy * usedScale);
+        }
+
+        /// <summary>
+        /// A container that grows in size to fit its children and retains its size when its children shrink
+        /// </summary>
+        private class GrowToFitContainer : Container
+        {
+            protected override Container<Drawable> Content => content;
+            private readonly Container content;
+
+            public GrowToFitContainer()
+            {
+                InternalChild = content = new Container
+                {
+                    AutoSizeAxes = Axes.Both,
+                };
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                Height = Math.Max(content.Height, Height);
+                Width = Math.Max(content.Width, Width);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
index d2cd7d3373..d801f4a215 100644
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
@@ -1,125 +1,8 @@
 // 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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Layout;
-using osuTK;
-using System;
-
 namespace osu.Game.Graphics.Containers
 {
-    /// <summary>
-    /// A container that reverts any rotation (and optionally scale) applied by its direct parent.
-    /// </summary>
-    public class UprightAspectMaintainingContainer : Container
-    {
-        protected override Container<Drawable> Content { get; }
-
-        /// <summary>
-        /// Controls how much this container scales compared to its parent (default is 1.0f).
-        /// </summary>
-        public float ScalingFactor { get; set; } = 1;
-
-        /// <summary>
-        /// Controls the scaling of this container.
-        /// </summary>
-        public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
-
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
-
-        public UprightAspectMaintainingContainer()
-        {
-            AddInternal(Content = new GrowToFitContainer());
-            AddLayout(layout);
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!layout.IsValid)
-            {
-                keepUprightAndUnstretched();
-                layout.Validate();
-            }
-        }
-
-        /// <summary>
-        /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
-        /// </summary>
-        private void keepUprightAndUnstretched()
-        {
-            // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
-            var parentMatrix = Parent.DrawInfo.Matrix;
-
-            // Remove Translation.
-            parentMatrix.M31 = 0.0f;
-            parentMatrix.M32 = 0.0f;
-
-            Matrix3 reversedParrent = parentMatrix.Inverted();
-
-            // Extract the rotation.
-            float angle = MathF.Atan2(reversedParrent.M12, reversedParrent.M11);
-            Rotation = MathHelper.RadiansToDegrees(angle);
-
-            // Remove rotation from the C matrix so that it only contains shear and scale.
-            Matrix3 m = Matrix3.CreateRotationZ(-angle);
-            reversedParrent *= m;
-
-            // Extract shear.
-            float alpha = reversedParrent.M21 / reversedParrent.M22;
-            Shear = new Vector2(-alpha, 0);
-
-            // Etract scale.
-            float sx = reversedParrent.M11;
-            float sy = reversedParrent.M22;
-
-            Vector3 parentScale = parentMatrix.ExtractScale();
-
-            float usedScale = 1.0f;
-
-            switch (Scaling)
-            {
-                case ScaleMode.Horizontal:
-                    usedScale = parentScale.X;
-                    break;
-
-                case ScaleMode.Vertical:
-                    usedScale = parentScale.Y;
-                    break;
-            }
-
-            usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
-
-            Scale = new Vector2(sx * usedScale, sy * usedScale);
-        }
-
-        /// <summary>
-        /// A container that grows in size to fit its children and retains its size when its children shrink
-        /// </summary>
-        private class GrowToFitContainer : Container
-        {
-            protected override Container<Drawable> Content => content;
-            private readonly Container content;
-
-            public GrowToFitContainer()
-            {
-                InternalChild = content = new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                };
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-                Height = Math.Max(content.Height, Height);
-                Width = Math.Max(content.Width, Width);
-            }
-        }
-    }
-
     public enum ScaleMode
     {
         /// <summary>

From 24edffcbc47628e49df7e25159d1dbb437f2ddd5 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 26 Aug 2022 12:47:12 +0100
Subject: [PATCH 098/709] Moved ScaleMode to
 UprightAspectMaintainingContainer.cs

---
 .../UprightAspectMaintainingContainer.cs      | 18 +++++++++++++++
 .../Containers/UprightUnscaledContainer.cs    | 23 -------------------
 2 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 osu.Game/Graphics/Containers/UprightUnscaledContainer.cs

diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index e556117bc0..9736cba206 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -119,4 +119,22 @@ namespace osu.Game.Graphics.Containers
             }
         }
     }
+
+    public enum ScaleMode
+    {
+        /// <summary>
+        /// Prevent this container from scaling.
+        /// </summary>
+        NoScaling,
+
+        /// <summary>
+        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
+        /// </summary>
+        Vertical,
+
+        /// <summary>
+        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
+        /// </summary>
+        Horizontal,
+    }
 }
diff --git a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs b/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
deleted file mode 100644
index d801f4a215..0000000000
--- a/osu.Game/Graphics/Containers/UprightUnscaledContainer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.
-
-namespace osu.Game.Graphics.Containers
-{
-    public enum ScaleMode
-    {
-        /// <summary>
-        /// Prevent this container from scaling.
-        /// </summary>
-        NoScaling,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the vertical scale of the parent.
-        /// </summary>
-        Vertical,
-
-        /// <summary>
-        /// Scale uniformly (maintaining aspect ratio) based on the horizontal scale of the parent.
-        /// </summary>
-        Horizontal,
-    }
-}

From 3e828c3416bd6d4f4701a5916be185eff71ab0f5 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:11:38 +0300
Subject: [PATCH 099/709] Move base layout from DifficultyMultiplierDisplay to
 another class

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 144 ++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 osu.Game/Overlays/Mods/ModsEffectDisplay.cs

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
new file mode 100644
index 0000000000..a7c5ec9ef9
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -0,0 +1,144 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    /// <inheritdoc />
+    /// <summary>
+    /// Base class for displays of mods effects.
+    /// </summary>
+    public abstract class ModsEffectDisplay : Container
+    {
+        public const float HEIGHT = 42;
+        private const float value_area_width = 56;
+        private const float transition_duration = 200;
+
+        private readonly Box contentBackground;
+        private readonly Box labelBackground;
+        private readonly Container content;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        /// <summary>
+        /// Text to display in the left area of the display.
+        /// </summary>
+        protected abstract LocalisableString Label { get; }
+
+        protected override Container<Drawable> Content => content;
+
+        protected ModsEffectDisplay()
+        {
+            Height = HEIGHT;
+            AutoSizeAxes = Axes.X;
+
+            InternalChild = new InputBlockingContainer
+            {
+                RelativeSizeAxes = Axes.Y,
+                AutoSizeAxes = Axes.X,
+                Masking = true,
+                CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                Children = new Drawable[]
+                {
+                    contentBackground = new Box
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = value_area_width + ModSelectPanel.CORNER_RADIUS
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.Absolute, value_area_width)
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    AutoSizeAxes = Axes.X,
+                                    Masking = true,
+                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
+                                    Children = new Drawable[]
+                                    {
+                                        labelBackground = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Margin = new MarginPadding { Horizontal = 18 },
+                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                            Text = Label,
+                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+                                        }
+                                    }
+                                },
+                                content = new Container
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            labelBackground.Colour = colourProvider.Background4;
+        }
+
+        /// <summary>
+        /// Fades colours of text and its background according to displayed value.
+        /// </summary>
+        /// <param name="difference">Difference between actual value and default value.
+        /// Negative leads to green color, positive to red. Can be obtained via CompareTo(defaultValue).</param>
+        protected void SetColours(int difference)
+        {
+            if (difference == 0)
+            {
+                contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+            }
+            else if (difference < 0)
+            {
+                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+            }
+            else
+            {
+                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+            }
+        }
+    }
+}

From 90334a2b91888698e449797f8c29d6f71c526885 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:12:45 +0300
Subject: [PATCH 100/709] Add test scene

---
 .../TestSceneModsEffectDisplay.cs             | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
new file mode 100644
index 0000000000..36267b0e2a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -0,0 +1,60 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModsEffectDisplay : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        [Test]
+        public void TestEffectDisplay()
+        {
+            TestDisplay dsp;
+            Add(dsp = new TestDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+            AddSliderStep("value", 40, 60, 50, i => dsp.Value = i);
+        }
+
+        private class TestDisplay : ModsEffectDisplay
+        {
+            private readonly OsuSpriteText text;
+
+            protected override LocalisableString Label => "Test display";
+
+            public int Value
+            {
+                set
+                {
+                    text.Text = value.ToString();
+                    SetColours(value.CompareTo(50));
+                }
+            }
+
+            public TestDisplay()
+            {
+                Add(text = new OsuSpriteText
+                {
+                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold),
+                    Text = "50"
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load() => SetColours(0);
+        }
+    }
+}

From 039f00956225ef2459da64469206a6a168c18687 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 27 Aug 2022 20:26:05 +0300
Subject: [PATCH 101/709] Inherit difficulty multiplier display from
 `ModsEffectDiplay`

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 140 +++---------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   4 +-
 2 files changed, 21 insertions(+), 123 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 835883fb93..e5daa2de63 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,27 +3,24 @@
 
 #nullable disable
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class DifficultyMultiplierDisplay : CompositeDrawable, IHasCurrentValue<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay, IHasCurrentValue<double>
     {
-        public const float HEIGHT = 42;
+        protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
         public Bindable<double> Current
         {
@@ -33,143 +30,44 @@ namespace osu.Game.Overlays.Mods
 
         private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>(1);
 
-        private readonly Box underlayBackground;
-        private readonly Box contentBackground;
-        private readonly FillFlowContainer multiplierFlow;
         private readonly MultiplierCounter multiplierCounter;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
-
-        private const float multiplier_value_area_width = 56;
-        private const float transition_duration = 200;
-
         public DifficultyMultiplierDisplay()
         {
-            Height = HEIGHT;
-            AutoSizeAxes = Axes.X;
-
-            InternalChild = new InputBlockingContainer
+            Add(new FillFlowContainer
             {
-                RelativeSizeAxes = Axes.Y,
-                AutoSizeAxes = Axes.X,
-                Masking = true,
-                CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0),
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(2, 0),
                 Children = new Drawable[]
                 {
-                    underlayBackground = new Box
+                    multiplierCounter = new MultiplierCounter
                     {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = multiplier_value_area_width + ModSelectPanel.CORNER_RADIUS
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Current = { BindTarget = Current }
                     },
-                    new GridContainer
+                    new SpriteIcon
                     {
-                        RelativeSizeAxes = Axes.Y,
-                        AutoSizeAxes = Axes.X,
-                        ColumnDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, multiplier_value_area_width)
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Y,
-                                    AutoSizeAxes = Axes.X,
-                                    Masking = true,
-                                    CornerRadius = ModSelectPanel.CORNER_RADIUS,
-                                    Children = new Drawable[]
-                                    {
-                                        contentBackground = new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Margin = new MarginPadding { Horizontal = 18 },
-                                            Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                            Text = DifficultyMultiplierDisplayStrings.DifficultyMultiplier,
-                                            Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-                                        }
-                                    }
-                                },
-                                multiplierFlow = new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
-                                    Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(2, 0),
-                                    Children = new Drawable[]
-                                    {
-                                        multiplierCounter = new MultiplierCounter
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            Current = { BindTarget = Current }
-                                        },
-                                        new SpriteIcon
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            Icon = FontAwesome.Solid.Times,
-                                            Size = new Vector2(7),
-                                            Margin = new MarginPadding { Top = 1 }
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.Times,
+                        Size = new Vector2(7),
+                        Margin = new MarginPadding { Top = 1 }
                     }
                 }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            contentBackground.Colour = colourProvider.Background4;
+            });
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            current.BindValueChanged(_ => updateState(), true);
+            current.BindValueChanged(e => SetColours(e.NewValue.CompareTo(current.Default)), true);
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(Current.Value);
-        }
-
-        private void updateState()
-        {
-            if (Current.IsDefault)
-            {
-                underlayBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                multiplierFlow.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                var backgroundColour = Current.Value < 1
-                    ? colours.ForModType(ModType.DifficultyReduction)
-                    : colours.ForModType(ModType.DifficultyIncrease);
-
-                underlayBackground.FadeColour(backgroundColour, transition_duration, Easing.OutQuint);
-                multiplierFlow.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-            }
+            multiplierCounter.SetCountWithoutRolling(current.Value);
         }
 
         private class MultiplierCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b993aca0ca..ccc075b190 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? DifficultyMultiplierDisplay.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = DifficultyMultiplierDisplay.HEIGHT,
+                    Height = ModsEffectDisplay.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {

From 2a12194ff9243e44dc8b29ff6e25dfd456ff4767 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sun, 28 Aug 2022 02:59:38 +0300
Subject: [PATCH 102/709] Test colours

---
 .../TestSceneModsEffectDisplay.cs             | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index 36267b0e2a..dd663ad59d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -1,38 +1,65 @@
 // 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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
+    [TestFixture]
     public class TestSceneModsEffectDisplay : OsuTestScene
     {
         [Cached]
         private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
         [Test]
-        public void TestEffectDisplay()
+        public void TestModsEffectDisplay()
         {
-            TestDisplay dsp;
-            Add(dsp = new TestDisplay
+            TestDisplay testDisplay = null!;
+            Box background = null!;
+
+            AddStep("add display", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
+                Add(testDisplay = new TestDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                });
+                var boxes = testDisplay.ChildrenOfType<Box>();
+                background = boxes.First();
             });
-            AddSliderStep("value", 40, 60, 50, i => dsp.Value = i);
+
+            AddStep("set value to default", () => testDisplay.Value = 50);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
+
+            AddStep("set value to less", () => testDisplay.Value = 40);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
+
+            AddStep("set value to bigger", () => testDisplay.Value = 60);
+            AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
         private class TestDisplay : ModsEffectDisplay
         {
             private readonly OsuSpriteText text;
 
+            public Container<Drawable> Container => Content;
+
             protected override LocalisableString Label => "Test display";
 
             public int Value

From d4a52baa56f0eee37c6a50ba65c29d57dc8bc3f9 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 29 Aug 2022 00:07:42 +0100
Subject: [PATCH 103/709] Added visual test for
 UprightAspectMaintainingContainer

---
 ...tSceneUprightAspectMaintainingContainer.cs | 245 ++++++++++++++++++
 1 file changed, 245 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
new file mode 100644
index 0000000000..8b87e4030e
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
@@ -0,0 +1,245 @@
+// 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.
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using osuTK.Graphics;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUprightAspectMaintainingContainer : OsuGridTestScene
+    {
+        private const int rows = 3;
+        private const int columns = 4;
+
+        private readonly ScaleMode[] scaleModeValues = { ScaleMode.NoScaling, ScaleMode.Horizontal, ScaleMode.Vertical };
+        private readonly float[] scalingFactorValues = { 1.0f / 3, 1.0f / 2, 1.0f, 1.5f };
+
+        private readonly List<List<Container>> parentContainers = new List<List<Container>>(rows);
+        private readonly List<List<UprightAspectMaintainingContainer>> childContainers = new List<List<UprightAspectMaintainingContainer>>(rows);
+
+        // Preferably should be set to (4 * 2^n)
+        private const int rotation_step_count = 8;
+
+        private readonly List<int> flipStates = new List<int>();
+        private readonly List<float> rotationSteps = new List<float>();
+        private readonly List<float> scaleSteps = new List<float>();
+
+        public TestSceneUprightAspectMaintainingContainer()
+            : base(rows, columns)
+        {
+            for (int i = 0; i < rows; i++)
+            {
+                parentContainers.Add(new List<Container>());
+                childContainers.Add(new List<UprightAspectMaintainingContainer>());
+
+                for (int j = 0; j < columns; j++)
+                {
+                    UprightAspectMaintainingContainer child;
+                    Container parent = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Height = 80,
+                        Width = 80,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = new Color4(255, 0, 0, 160),
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = "Parent",
+                            },
+                            child = new UprightAspectMaintainingContainer
+                            {
+                                Origin = Anchor.Centre,
+                                Anchor = Anchor.Centre,
+                                AutoSizeAxes = Axes.Both,
+
+                                // These are the parameters being Tested
+                                Scaling = scaleModeValues[i],
+                                ScalingFactor = scalingFactorValues[j],
+
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = new Color4(0, 0, 255, 160),
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Text = "Text",
+                                        Font = OsuFont.Numeric,
+                                        Origin = Anchor.Centre,
+                                        Anchor = Anchor.Centre,
+                                        Padding = new MarginPadding
+                                        {
+                                            Horizontal = 4,
+                                            Vertical = 4,
+                                        }
+                                    },
+                                }
+                            }
+                        }
+                    };
+
+                    Container cellInfo = new Container
+                    {
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = "Scaling: " + scaleModeValues[i].ToString(),
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = "ScalingFactor: " + scalingFactorValues[j].ToString("0.00"),
+                                Margin = new MarginPadding
+                                {
+                                    Top = 15,
+                                },
+                            },
+                        },
+                    };
+
+                    Cell(i * columns + j).Add(cellInfo);
+                    Cell(i * columns + j).Add(parent);
+                    parentContainers[i].Add(parent);
+                    childContainers[i].Add(child);
+                }
+            }
+
+            flipStates.AddRange(new[] { 1, -1 });
+            rotationSteps.AddRange(Enumerable.Range(0, rotation_step_count).Select(x => 360f * ((float)x / rotation_step_count)));
+            scaleSteps.AddRange(new[] { 1, 0.5f, 0.3f, 1.5f, 2.0f });
+        }
+
+        [Test]
+        public void ExplicitlySizedParent()
+        {
+            var parentStates = from xFlip in flipStates
+                               from yFlip in flipStates
+                               from xScale in scaleSteps
+                               from yScale in scaleSteps
+                               from rotation in rotationSteps
+                               select new { xFlip, yFlip, xScale, yScale, rotation };
+
+            foreach (var state in parentStates)
+            {
+                Vector2 parentScale = new Vector2(state.xFlip * state.xScale, state.yFlip * state.yScale);
+                float parentRotation = state.rotation;
+
+                AddStep("S: (" + parentScale.X.ToString("0.00") + ", " + parentScale.Y.ToString("0.00") + "), R: " + parentRotation.ToString("0.00"), () =>
+                {
+                    foreach (List<Container> list in parentContainers)
+                    {
+                        foreach (Container container in list)
+                        {
+                            container.Scale = parentScale;
+                            container.Rotation = parentRotation;
+                        }
+                    }
+                });
+
+                AddAssert("Check if state is valid", () =>
+                {
+                    foreach (int i in Enumerable.Range(0, parentContainers.Count))
+                    {
+                        foreach (int j in Enumerable.Range(0, parentContainers[i].Count))
+                        {
+                            if (!uprightAspectMaintainingContainerStateIsValid(parentContainers[i][j], childContainers[i][j]))
+                                return false;
+                        }
+                    }
+
+                    return true;
+                });
+            }
+        }
+
+        private bool uprightAspectMaintainingContainerStateIsValid(Container parent, UprightAspectMaintainingContainer child)
+        {
+            Matrix3 parentMatrix = parent.DrawInfo.Matrix;
+            Matrix3 childMatrix = child.DrawInfo.Matrix;
+            Vector3 childScale = childMatrix.ExtractScale();
+            Vector3 parentScale = parentMatrix.ExtractScale();
+
+            // Orientation check
+            if (!(isNearlyZero(MathF.Abs(childMatrix.M21)) && isNearlyZero(MathF.Abs(childMatrix.M12))))
+                return false;
+
+            // flip check
+            if (!(childMatrix.M11 * childMatrix.M22 > 0))
+                return false;
+
+            // Aspect ratio check
+            if (!isNearlyZero(childScale.X - childScale.Y, 0.0001f))
+                return false;
+
+            // ScalingMode check
+            switch (child.Scaling)
+            {
+                case ScaleMode.NoScaling:
+                    if (!(isNearlyZero(childMatrix.M11 - 1.0f) && isNearlyZero(childMatrix.M22 - 1.0f)))
+                        return false;
+
+                    break;
+
+                case ScaleMode.Vertical:
+                    if (!(checkScaling(child.ScalingFactor, parentScale.Y, childScale.Y)))
+                        return false;
+
+                    break;
+
+                case ScaleMode.Horizontal:
+                    if (!(checkScaling(child.ScalingFactor, parentScale.X, childScale.X)))
+                        return false;
+
+                    break;
+            }
+
+            return true;
+        }
+
+        private bool checkScaling(float scalingFactor, float parentScale, float childScale)
+        {
+            if (scalingFactor <= 1.0f)
+            {
+                if (!isNearlyZero(1.0f + (parentScale - 1.0f) * scalingFactor - childScale))
+                    return false;
+            }
+            else if (scalingFactor > 1.0f)
+            {
+                if (parentScale < 1.0f)
+                {
+                    if (!isNearlyZero((parentScale * (1.0f / scalingFactor)) - childScale))
+                        return false;
+                }
+                else if (!isNearlyZero(parentScale * scalingFactor - childScale))
+                    return false;
+            }
+
+            return true;
+        }
+
+        private bool isNearlyZero(float f, float epsilon = 0.00001f)
+        {
+            return f < epsilon;
+        }
+    }
+}

From 62210bce4ee3c97c212e9f064ec6631ab271dd10 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 29 Aug 2022 00:08:19 +0100
Subject: [PATCH 104/709] Fixed issues found in
 UprightAspectMaintainingContainer

---
 .../UprightAspectMaintainingContainer.cs      | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index 9736cba206..64b9eb409b 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Graphics.Containers
     /// </summary>
     public class UprightAspectMaintainingContainer : Container
     {
-        protected override Container<Drawable> Content { get; }
-
         /// <summary>
         /// Controls how much this container scales compared to its parent (default is 1.0f).
         /// </summary>
@@ -30,7 +28,6 @@ namespace osu.Game.Graphics.Containers
 
         public UprightAspectMaintainingContainer()
         {
-            AddInternal(Content = new GrowToFitContainer());
             AddLayout(layout);
         }
 
@@ -45,6 +42,14 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
+        public override void Add(Drawable drawable)
+        {
+            base.Add(new GrowToFitContainer
+            {
+                Child = drawable
+            });
+        }
+
         /// <summary>
         /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
         /// </summary>
@@ -57,23 +62,23 @@ namespace osu.Game.Graphics.Containers
             parentMatrix.M31 = 0.0f;
             parentMatrix.M32 = 0.0f;
 
-            Matrix3 reversedParrent = parentMatrix.Inverted();
+            Matrix3 reversedParent = parentMatrix.Inverted();
 
             // Extract the rotation.
-            float angle = MathF.Atan2(reversedParrent.M12, reversedParrent.M11);
+            float angle = MathF.Atan2(reversedParent.M12, reversedParent.M11);
             Rotation = MathHelper.RadiansToDegrees(angle);
 
             // Remove rotation from the C matrix so that it only contains shear and scale.
             Matrix3 m = Matrix3.CreateRotationZ(-angle);
-            reversedParrent *= m;
+            reversedParent *= m;
 
             // Extract shear.
-            float alpha = reversedParrent.M21 / reversedParrent.M22;
+            float alpha = reversedParent.M21 / reversedParent.M22;
             Shear = new Vector2(-alpha, 0);
 
             // Etract scale.
-            float sx = reversedParrent.M11;
-            float sy = reversedParrent.M22;
+            float sx = reversedParent.M11;
+            float sy = reversedParent.M22;
 
             Vector3 parentScale = parentMatrix.ExtractScale();
 
@@ -90,32 +95,30 @@ namespace osu.Game.Graphics.Containers
                     break;
             }
 
-            usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
+            if (Scaling != ScaleMode.NoScaling)
+            {
+                if (ScalingFactor < 1.0f)
+                    usedScale = 1.0f + (usedScale - 1.0f) * ScalingFactor;
+                if (ScalingFactor > 1.0f)
+                    usedScale = (usedScale < 1.0f) ? usedScale * (1.0f / ScalingFactor) : usedScale * ScalingFactor;
+            }
 
             Scale = new Vector2(sx * usedScale, sy * usedScale);
         }
 
-        /// <summary>
-        /// A container that grows in size to fit its children and retains its size when its children shrink
-        /// </summary>
-        private class GrowToFitContainer : Container
+        public class GrowToFitContainer : Container
         {
-            protected override Container<Drawable> Content => content;
-            private readonly Container content;
-
-            public GrowToFitContainer()
-            {
-                InternalChild = content = new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                };
-            }
-
             protected override void Update()
             {
-                base.Update();
-                Height = Math.Max(content.Height, Height);
-                Width = Math.Max(content.Width, Width);
+                if ((Child.RelativeSizeAxes & Axes.X) != 0)
+                    RelativeSizeAxes |= Axes.X;
+                else
+                    Width = Math.Max(Child.Width, Width);
+
+                if ((Child.RelativeSizeAxes & Axes.Y) != 0)
+                    RelativeSizeAxes |= Axes.Y;
+                else
+                    Height = Math.Max(Child.Height, Height);
             }
         }
     }

From 7faeed88b053e6b06f3de90fdb74b89ca1793215 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:08:43 +0300
Subject: [PATCH 105/709] Add ability to override width of value area

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index a7c5ec9ef9..4b97614ade 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Overlays.Mods
     public abstract class ModsEffectDisplay : Container
     {
         public const float HEIGHT = 42;
-        private const float value_area_width = 56;
         private const float transition_duration = 200;
 
         private readonly Box contentBackground;
@@ -38,6 +37,8 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
+        protected virtual float ValueAreaWidth => 56;
+
         protected override Container<Drawable> Content => content;
 
         protected ModsEffectDisplay()
@@ -59,7 +60,7 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
                         RelativeSizeAxes = Axes.Y,
-                        Width = value_area_width + ModSelectPanel.CORNER_RADIUS
+                        Width = ValueAreaWidth + ModSelectPanel.CORNER_RADIUS
                     },
                     new GridContainer
                     {
@@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Mods
                         ColumnDimensions = new[]
                         {
                             new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.Absolute, value_area_width)
+                            new Dimension(GridSizeMode.Absolute, ValueAreaWidth)
                         },
                         Content = new[]
                         {

From 5343c2645253407a218ee7916dfe11cd347ed4e5 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:48:27 +0300
Subject: [PATCH 106/709] Control colour via `Current` bindable

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 92 +++++++++++++++++----
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 4b97614ade..2ff6bf043b 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -1,10 +1,13 @@
 // 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -13,11 +16,10 @@ using osuTK;
 
 namespace osu.Game.Overlays.Mods
 {
-    /// <inheritdoc />
     /// <summary>
     /// Base class for displays of mods effects.
     /// </summary>
-    public abstract class ModsEffectDisplay : Container
+    public abstract class ModsEffectDisplay<TValue> : Container, IHasCurrentValue<TValue>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -26,6 +28,14 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly Container content;
 
+        public Bindable<TValue> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly BindableWithCurrent<TValue> current = new BindableWithCurrent<TValue>();
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -37,6 +47,13 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
+        /// <summary>
+        /// Calculates, does current value increase difficulty or decrease it.
+        /// </summary>
+        /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
+        /// <returns>Effect of the value.</returns>
+        protected abstract ModEffect CalculateEffect(TValue value);
+
         protected virtual float ValueAreaWidth => 56;
 
         protected override Container<Drawable> Content => content;
@@ -118,28 +135,67 @@ namespace osu.Game.Overlays.Mods
             labelBackground.Colour = colourProvider.Background4;
         }
 
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(e =>
+            {
+                var effect = CalculateEffect(e.NewValue);
+                setColours(effect);
+            }, true);
+        }
+
         /// <summary>
         /// Fades colours of text and its background according to displayed value.
         /// </summary>
-        /// <param name="difference">Difference between actual value and default value.
-        /// Negative leads to green color, positive to red. Can be obtained via CompareTo(defaultValue).</param>
-        protected void SetColours(int difference)
+        /// <param name="effect">Effect of the value.</param>
+        private void setColours(ModEffect effect)
         {
-            if (difference == 0)
+            switch (effect)
             {
-                contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
-                content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
-            }
-            else if (difference < 0)
-            {
-                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
-                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
-                content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                case ModEffect.NotChanged:
+                    contentBackground.FadeColour(colourProvider.Background3, transition_duration, Easing.OutQuint);
+                    content.FadeColour(Colour4.White, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyReduction:
+                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyReduction), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                case ModEffect.DifficultyIncrease:
+                    contentBackground.FadeColour(colours.ForModType(ModType.DifficultyIncrease), transition_duration, Easing.OutQuint);
+                    content.FadeColour(colourProvider.Background5, transition_duration, Easing.OutQuint);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(effect));
             }
         }
+
+        #region Quick implementations for CalculateEffect
+
+        /// <summary>
+        /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
+        /// </summary>
+        /// <param name="comparison">Value to convert. Can be obtained from CompareTo.</param>
+        /// <returns>Effect.</returns>
+        protected ModEffect CalculateForSign(int comparison)
+        {
+            if (comparison == 0)
+                return ModEffect.NotChanged;
+            if (comparison < 0)
+                return ModEffect.DifficultyReduction;
+
+            return ModEffect.DifficultyIncrease;
+        }
+
+        #endregion
+
+        protected enum ModEffect
+        {
+            NotChanged,
+            DifficultyReduction,
+            DifficultyIncrease
+        }
     }
 }

From 545e0bbcef580ab282235ba69585996a16bd6020 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 29 Aug 2022 22:48:45 +0300
Subject: [PATCH 107/709] Adjust inheritors and test

---
 .../TestSceneModsEffectDisplay.cs             | 25 ++++++++-----------
 .../Mods/DifficultyMultiplierDisplay.cs       | 19 ++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  4 +--
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index dd663ad59d..ec50a07998 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -44,32 +44,24 @@ namespace osu.Game.Tests.Visual.UserInterface
                 background = boxes.First();
             });
 
-            AddStep("set value to default", () => testDisplay.Value = 50);
+            AddStep("set value to default", () => testDisplay.Current.Value = 50);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == Color4.White && background.Colour == colourProvider.Background3);
 
-            AddStep("set value to less", () => testDisplay.Value = 40);
+            AddStep("set value to less", () => testDisplay.Current.Value = 40);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyReduction));
 
-            AddStep("set value to bigger", () => testDisplay.Value = 60);
+            AddStep("set value to bigger", () => testDisplay.Current.Value = 60);
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private class TestDisplay : ModsEffectDisplay
+        private class TestDisplay : ModsEffectDisplay<int>
         {
             private readonly OsuSpriteText text;
 
             public Container<Drawable> Container => Content;
 
             protected override LocalisableString Label => "Test display";
-
-            public int Value
-            {
-                set
-                {
-                    text.Text = value.ToString();
-                    SetColours(value.CompareTo(50));
-                }
-            }
+            protected override ModEffect CalculateEffect(int value) => CalculateForSign(value.CompareTo(50));
 
             public TestDisplay()
             {
@@ -80,8 +72,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
             }
 
-            [BackgroundDependencyLoader]
-            private void load() => SetColours(0);
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Current.BindValueChanged(e => text.Text = e.NewValue.ToString(), true);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index e5daa2de63..843310249e 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,12 +3,10 @@
 
 #nullable disable
 
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -18,22 +16,17 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay, IHasCurrentValue<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay<double>
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-
-        public Bindable<double> Current
-        {
-            get => current.Current;
-            set => current.Current = value;
-        }
-
-        private readonly BindableNumberWithCurrent<double> current = new BindableNumberWithCurrent<double>(1);
+        protected override ModEffect CalculateEffect(double value) => CalculateForSign(value.CompareTo(1d));
 
         private readonly MultiplierCounter multiplierCounter;
 
         public DifficultyMultiplierDisplay()
         {
+            Current.Default = 1d;
+            Current.Value = 1d;
             Add(new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -63,11 +56,9 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            current.BindValueChanged(e => SetColours(e.NewValue.CompareTo(current.Default)), true);
-
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(current.Value);
+            multiplierCounter.SetCountWithoutRolling(Current.Value);
         }
 
         private class MultiplierCounter : RollingCounter<double>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index ccc075b190..80f18eafeb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay<int>.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay.HEIGHT,
+                    Height = ModsEffectDisplay<int>.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {

From d20e7da2d98365e6e2e75fc239132069964d5344 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 29 Aug 2022 21:03:22 +0100
Subject: [PATCH 108/709] Changed epsilon

---
 .../TestSceneUprightAspectMaintainingContainer.cs            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
index 8b87e4030e..f81f8e8d85 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
@@ -10,6 +10,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics;
@@ -188,7 +189,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 return false;
 
             // Aspect ratio check
-            if (!isNearlyZero(childScale.X - childScale.Y, 0.0001f))
+            if (!isNearlyZero(childScale.X - childScale.Y))
                 return false;
 
             // ScalingMode check
@@ -237,7 +238,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             return true;
         }
 
-        private bool isNearlyZero(float f, float epsilon = 0.00001f)
+        private bool isNearlyZero(float f, float epsilon = Precision.FLOAT_EPSILON)
         {
             return f < epsilon;
         }

From 43f2ba659697370d5e885d2adf784852447f1535 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 29 Aug 2022 22:00:33 +0100
Subject: [PATCH 109/709] Added test scene

---
 .../TestSceneGrowToFitContent.cs              | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs
new file mode 100644
index 0000000000..bcff992f9d
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs
@@ -0,0 +1,175 @@
+// 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.
+
+#nullable disable
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using System.Linq;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneGrowToFitContent : OsuGridTestScene
+    {
+        private readonly List<Container> parentContainers = new List<Container>();
+        private readonly List<UprightAspectMaintainingContainer> childContainers = new List<UprightAspectMaintainingContainer>();
+        private readonly List<OsuSpriteText> texts = new List<OsuSpriteText>();
+
+        public TestSceneGrowToFitContent()
+            : base(1, 2)
+        {
+            for (int i = 0; i < 2; i++)
+            {
+                OsuSpriteText text;
+                UprightAspectMaintainingContainer childContainer;
+                Container parentContainer = new Container
+                {
+                    Origin = Anchor.BottomRight,
+                    Anchor = Anchor.BottomCentre,
+                    AutoSizeAxes = Axes.Both,
+                    Rotation = 45,
+                    Y = -200,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Colour4.Red,
+                        },
+                        childContainer = new UprightAspectMaintainingContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Colour4.Blue,
+                                },
+                                text = new OsuSpriteText
+                                {
+                                    Text = "Text",
+                                    Font = OsuFont.GetFont(Typeface.Venera, weight: FontWeight.Bold, size: 40),
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                },
+                            }
+                        },
+                    }
+                };
+
+                Container cellInfo = new Container
+                {
+                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    Margin = new MarginPadding
+                    {
+                        Top = 100,
+                    },
+                    Child = new OsuSpriteText
+                    {
+                        Text = (i == 0) ? "GrowToFitContent == true" : "GrowToFitContent == false",
+                        Font = OsuFont.GetFont(Typeface.Inter, weight: FontWeight.Bold, size: 40),
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                    },
+                };
+
+                parentContainers.Add(parentContainer);
+                childContainers.Add(childContainer);
+                texts.Add(text);
+                Cell(i).Add(cellInfo);
+                Cell(i).Add(parentContainer);
+            }
+        }
+
+        [Test]
+        public void TestResizeText()
+        {
+            AddStep("reset...", () =>
+            {
+                childContainers[0].GrowToFitContent = false;
+                childContainers[1].GrowToFitContent = false;
+            });
+
+            AddStep("setup...", () =>
+            {
+                childContainers[0].GrowToFitContent = true;
+                childContainers[1].GrowToFitContent = false;
+            });
+
+            for (int i = 0; i < 10; i++)
+            {
+                AddStep("Add Character", () =>
+                {
+                    foreach (int j in Enumerable.Range(0, parentContainers.Count))
+                    {
+                        texts[j].Text += ".";
+                    }
+                });
+            }
+
+            for (int i = 0; i < 10; i++)
+            {
+                AddStep("Remove Character", () =>
+                {
+                    foreach (int j in Enumerable.Range(0, parentContainers.Count))
+                    {
+                        string text = texts[j].Text.ToString();
+                        texts[j].Text = text.Remove(text.Length - 1, 1);
+                    }
+                });
+            }
+        }
+
+        [Test]
+        public void TestScaleText()
+        {
+            AddStep("reset...", () =>
+            {
+                childContainers[0].GrowToFitContent = false;
+                childContainers[1].GrowToFitContent = false;
+            });
+
+            AddStep("setup...", () =>
+            {
+                childContainers[0].GrowToFitContent = true;
+                childContainers[1].GrowToFitContent = false;
+            });
+
+            for (int i = 0; i < 1; i++)
+            {
+                AddStep("Big text", scaleUp);
+
+                AddWaitStep("wait...", 5);
+
+                AddStep("Small text", scaleDown);
+            }
+        }
+
+        private void scaleUp()
+        {
+            foreach (int j in Enumerable.Range(0, parentContainers.Count))
+            {
+                texts[j].ScaleTo(new Vector2(2, 2), 1000);
+            }
+        }
+
+        private void scaleDown()
+        {
+            foreach (int j in Enumerable.Range(0, parentContainers.Count))
+            {
+                texts[j].ScaleTo(new Vector2(1, 1), 1000);
+            }
+        }
+    }
+}

From cda7faecf798e9ad9242c44b0edcf544fb5d1801 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Mon, 29 Aug 2022 22:01:24 +0100
Subject: [PATCH 110/709] Added GrowToFitContent Parameter.

---
 .../UprightAspectMaintainingContainer.cs      | 86 ++++++++++++++++---
 1 file changed, 73 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index 64b9eb409b..8efc29c83c 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -24,6 +24,27 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
 
+        /// <summary>
+        /// If this is true, all wrapper containers will be set to grow with their content
+        /// and not shrink back, this is used to fix the position of children that change
+        /// in size when using AutoSizeAxes.
+        /// </summary>
+        public bool GrowToFitContent
+        {
+            get => growToFitContent;
+            set
+            {
+                if (growToFitContent != value)
+                {
+                    foreach (GrowToFitContainer c in Children)
+                        c.GrowToFitContentUpdated = true;
+                    growToFitContent = value;
+                }
+            }
+        }
+
+        private bool growToFitContent = true;
+
         private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
 
         public UprightAspectMaintainingContainer()
@@ -44,10 +65,11 @@ namespace osu.Game.Graphics.Containers
 
         public override void Add(Drawable drawable)
         {
-            base.Add(new GrowToFitContainer
-            {
-                Child = drawable
-            });
+            var wrapper = new GrowToFitContainer();
+            wrapper.Wrap(drawable);
+            wrapper.AutoSizeAxes = Axes.None;
+            drawable.Origin = drawable.Anchor = Anchor.Centre;
+            base.Add(wrapper);
         }
 
         /// <summary>
@@ -58,7 +80,7 @@ namespace osu.Game.Graphics.Containers
             // Decomposes the inverse of the parent DrawInfo.Matrix into rotation, shear and scale.
             var parentMatrix = Parent.DrawInfo.Matrix;
 
-            // Remove Translation.
+            // Remove Translation.>
             parentMatrix.M31 = 0.0f;
             parentMatrix.M32 = 0.0f;
 
@@ -108,17 +130,55 @@ namespace osu.Game.Graphics.Containers
 
         public class GrowToFitContainer : Container
         {
+            private readonly LayoutValue layout = new LayoutValue(Invalidation.RequiredParentSizeToFit, InvalidationSource.Child);
+
+            private Vector2 maxChildSize;
+
+            public bool GrowToFitContentUpdated { get; set; }
+
+            public GrowToFitContainer()
+            {
+                AddLayout(layout);
+            }
+
             protected override void Update()
             {
-                if ((Child.RelativeSizeAxes & Axes.X) != 0)
-                    RelativeSizeAxes |= Axes.X;
-                else
-                    Width = Math.Max(Child.Width, Width);
+                UprightAspectMaintainingContainer parent = (UprightAspectMaintainingContainer)Parent;
 
-                if ((Child.RelativeSizeAxes & Axes.Y) != 0)
-                    RelativeSizeAxes |= Axes.Y;
-                else
-                    Height = Math.Max(Child.Height, Height);
+                if (!layout.IsValid || GrowToFitContentUpdated)
+                {
+                    if ((Child.RelativeSizeAxes & Axes.X) != 0)
+                        RelativeSizeAxes |= Axes.X;
+                    else
+                    {
+                        if (parent.GrowToFitContent)
+                            Width = Math.Max(Child.Width * Child.Scale.X, maxChildSize.X);
+                        else
+                            Width = Child.Width * Child.Scale.X;
+                    }
+
+                    if ((Child.RelativeSizeAxes & Axes.Y) != 0)
+                        RelativeSizeAxes |= Axes.Y;
+                    else
+                    {
+                        if (parent.GrowToFitContent)
+                            Height = Math.Max(Child.Height * Child.Scale.Y, maxChildSize.Y);
+                        else
+                            Height = Child.Height * Child.Scale.Y;
+                    }
+
+                    // reset max_child_size or update it
+                    if (!parent.GrowToFitContent)
+                        maxChildSize = Child.Size;
+                    else
+                    {
+                        maxChildSize.X = MathF.Max(maxChildSize.X, Child.Size.X);
+                        maxChildSize.Y = MathF.Max(maxChildSize.Y, Child.Size.Y);
+                    }
+
+                    GrowToFitContentUpdated = false;
+                    layout.Validate();
+                }
             }
         }
     }

From eb02a9a14442d970b2b710b69e749abaa7cd93eb Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Wed, 31 Aug 2022 22:04:28 +0100
Subject: [PATCH 111/709] Removed GrowToFItContainer

---
 .../UprightAspectMaintainingContainer.cs      | 84 -------------------
 1 file changed, 84 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
index 8efc29c83c..300b5bd4b4 100644
--- a/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
+++ b/osu.Game/Graphics/Containers/UprightAspectMaintainingContainer.cs
@@ -24,27 +24,6 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public ScaleMode Scaling { get; set; } = ScaleMode.Vertical;
 
-        /// <summary>
-        /// If this is true, all wrapper containers will be set to grow with their content
-        /// and not shrink back, this is used to fix the position of children that change
-        /// in size when using AutoSizeAxes.
-        /// </summary>
-        public bool GrowToFitContent
-        {
-            get => growToFitContent;
-            set
-            {
-                if (growToFitContent != value)
-                {
-                    foreach (GrowToFitContainer c in Children)
-                        c.GrowToFitContentUpdated = true;
-                    growToFitContent = value;
-                }
-            }
-        }
-
-        private bool growToFitContent = true;
-
         private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawInfo, InvalidationSource.Parent);
 
         public UprightAspectMaintainingContainer()
@@ -63,15 +42,6 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
-        public override void Add(Drawable drawable)
-        {
-            var wrapper = new GrowToFitContainer();
-            wrapper.Wrap(drawable);
-            wrapper.AutoSizeAxes = Axes.None;
-            drawable.Origin = drawable.Anchor = Anchor.Centre;
-            base.Add(wrapper);
-        }
-
         /// <summary>
         /// Keeps the drawable upright and unstretched preventing it from being rotated, sheared, scaled or flipped with its Parent.
         /// </summary>
@@ -127,60 +97,6 @@ namespace osu.Game.Graphics.Containers
 
             Scale = new Vector2(sx * usedScale, sy * usedScale);
         }
-
-        public class GrowToFitContainer : Container
-        {
-            private readonly LayoutValue layout = new LayoutValue(Invalidation.RequiredParentSizeToFit, InvalidationSource.Child);
-
-            private Vector2 maxChildSize;
-
-            public bool GrowToFitContentUpdated { get; set; }
-
-            public GrowToFitContainer()
-            {
-                AddLayout(layout);
-            }
-
-            protected override void Update()
-            {
-                UprightAspectMaintainingContainer parent = (UprightAspectMaintainingContainer)Parent;
-
-                if (!layout.IsValid || GrowToFitContentUpdated)
-                {
-                    if ((Child.RelativeSizeAxes & Axes.X) != 0)
-                        RelativeSizeAxes |= Axes.X;
-                    else
-                    {
-                        if (parent.GrowToFitContent)
-                            Width = Math.Max(Child.Width * Child.Scale.X, maxChildSize.X);
-                        else
-                            Width = Child.Width * Child.Scale.X;
-                    }
-
-                    if ((Child.RelativeSizeAxes & Axes.Y) != 0)
-                        RelativeSizeAxes |= Axes.Y;
-                    else
-                    {
-                        if (parent.GrowToFitContent)
-                            Height = Math.Max(Child.Height * Child.Scale.Y, maxChildSize.Y);
-                        else
-                            Height = Child.Height * Child.Scale.Y;
-                    }
-
-                    // reset max_child_size or update it
-                    if (!parent.GrowToFitContent)
-                        maxChildSize = Child.Size;
-                    else
-                    {
-                        maxChildSize.X = MathF.Max(maxChildSize.X, Child.Size.X);
-                        maxChildSize.Y = MathF.Max(maxChildSize.Y, Child.Size.Y);
-                    }
-
-                    GrowToFitContentUpdated = false;
-                    layout.Validate();
-                }
-            }
-        }
     }
 
     public enum ScaleMode

From 4a630b53846f64d1f1d5fd96569991fdd316b246 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Wed, 31 Aug 2022 22:05:06 +0100
Subject: [PATCH 112/709] Implemented SizePreservingSpriteText

---
 .../Sprites/SizePreservingTextSprite.cs       | 107 ++++++++++++++++++
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs |  12 +-
 2 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs

diff --git a/osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs b/osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs
new file mode 100644
index 0000000000..11b81b26fd
--- /dev/null
+++ b/osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs
@@ -0,0 +1,107 @@
+// 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.
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.Sprites
+{
+    public class SizePreservingSpriteText : CompositeDrawable
+    {
+        private readonly OsuSpriteText text = new OsuSpriteText();
+
+        private Vector2 maximumSize;
+
+        public SizePreservingSpriteText(Vector2? minimumSize = null)
+        {
+            text.Origin = Anchor.Centre;
+            text.Anchor = Anchor.Centre;
+
+            AddInternal(text);
+            maximumSize = minimumSize ?? Vector2.Zero;
+        }
+
+        protected override void Update()
+        {
+            Width = maximumSize.X = MathF.Max(maximumSize.X, text.Width);
+            Height = maximumSize.Y = MathF.Max(maximumSize.Y, text.Height);
+        }
+
+        public new Axes AutoSizeAxes
+        {
+            get => Axes.None;
+            set => throw new InvalidOperationException("You can't set AutoSizeAxes of this container");
+        }
+
+        /// <summary>
+        /// Gets or sets the text to be displayed.
+        /// </summary>
+        public LocalisableString Text
+        {
+            get => text.Text;
+            set => text.Text = value;
+        }
+
+        /// <summary>
+        /// Contains information on the font used to display the text.
+        /// </summary>
+        public FontUsage Font
+        {
+            get => text.Font;
+            set => text.Font = value;
+        }
+
+        /// <summary>
+        /// True if a shadow should be displayed around the text.
+        /// </summary>
+        public bool Shadow
+        {
+            get => text.Shadow;
+            set => text.Shadow = value;
+        }
+
+        /// <summary>
+        /// The colour of the shadow displayed around the text. A shadow will only be displayed if the <see cref="Shadow"/> property is set to true.
+        /// </summary>
+        public Color4 ShadowColour
+        {
+            get => text.ShadowColour;
+            set => text.ShadowColour = value;
+        }
+
+        /// <summary>
+        /// The offset of the shadow displayed around the text. A shadow will only be displayed if the <see cref="Shadow"/> property is set to true.
+        /// </summary>
+        public Vector2 ShadowOffset
+        {
+            get => text.ShadowOffset;
+            set => text.ShadowOffset = value;
+        }
+
+        /// <summary>
+        /// True if the <see cref="SpriteText"/>'s vertical size should be equal to <see cref="FontUsage.Size"/>  (the full height) or precisely the size of used characters.
+        /// Set to false to allow better centering of individual characters/numerals/etc.
+        /// </summary>
+        public bool UseFullGlyphHeight
+        {
+            get => text.UseFullGlyphHeight;
+            set => text.UseFullGlyphHeight = value;
+        }
+
+        public override bool IsPresent => text.IsPresent;
+
+        public override string ToString() => text.ToString();
+
+        public float LineBaseHeight => text.LineBaseHeight;
+
+        public IEnumerable<LocalisableString> FilterTerms => text.FilterTerms;
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 81abfce0c7..d0eb8f8ca1 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class SongProgressInfo : Container
     {
-        private OsuSpriteText timeCurrent;
-        private OsuSpriteText timeLeft;
-        private OsuSpriteText progress;
+        private SizePreservingSpriteText timeCurrent;
+        private SizePreservingSpriteText timeLeft;
+        private SizePreservingSpriteText progress;
 
         private double startTime;
         private double endTime;
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Scaling = ScaleMode.Vertical,
                         ScalingFactor = 0.5f,
-                        Child = timeCurrent = new OsuSpriteText
+                        Child = timeCurrent = new SizePreservingSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Scaling = ScaleMode.Vertical,
                         ScalingFactor = 0.5f,
-                        Child = progress = new OsuSpriteText
+                        Child = progress = new SizePreservingSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Play.HUD
                         AutoSizeAxes = Axes.Both,
                         Scaling = ScaleMode.Vertical,
                         ScalingFactor = 0.5f,
-                        Child = timeLeft = new OsuSpriteText
+                        Child = timeLeft = new SizePreservingSpriteText
                         {
                             Origin = Anchor.Centre,
                             Anchor = Anchor.Centre,

From a548b28158c018d738d29fd2a2e94b70c00673f7 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Wed, 31 Aug 2022 22:05:46 +0100
Subject: [PATCH 113/709] Added test scene for SizePreservingSpriteText

---
 .../TestSceneGrowToFitContent.cs              | 175 ------------------
 .../TestSceneSizePreservingTextSprite.cs      |  96 ++++++++++
 2 files changed, 96 insertions(+), 175 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs
deleted file mode 100644
index bcff992f9d..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneGrowToFitContent.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics;
-using System.Linq;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneGrowToFitContent : OsuGridTestScene
-    {
-        private readonly List<Container> parentContainers = new List<Container>();
-        private readonly List<UprightAspectMaintainingContainer> childContainers = new List<UprightAspectMaintainingContainer>();
-        private readonly List<OsuSpriteText> texts = new List<OsuSpriteText>();
-
-        public TestSceneGrowToFitContent()
-            : base(1, 2)
-        {
-            for (int i = 0; i < 2; i++)
-            {
-                OsuSpriteText text;
-                UprightAspectMaintainingContainer childContainer;
-                Container parentContainer = new Container
-                {
-                    Origin = Anchor.BottomRight,
-                    Anchor = Anchor.BottomCentre,
-                    AutoSizeAxes = Axes.Both,
-                    Rotation = 45,
-                    Y = -200,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Colour4.Red,
-                        },
-                        childContainer = new UprightAspectMaintainingContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Colour4.Blue,
-                                },
-                                text = new OsuSpriteText
-                                {
-                                    Text = "Text",
-                                    Font = OsuFont.GetFont(Typeface.Venera, weight: FontWeight.Bold, size: 40),
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre,
-                                },
-                            }
-                        },
-                    }
-                };
-
-                Container cellInfo = new Container
-                {
-                    Origin = Anchor.TopCentre,
-                    Anchor = Anchor.TopCentre,
-                    Margin = new MarginPadding
-                    {
-                        Top = 100,
-                    },
-                    Child = new OsuSpriteText
-                    {
-                        Text = (i == 0) ? "GrowToFitContent == true" : "GrowToFitContent == false",
-                        Font = OsuFont.GetFont(Typeface.Inter, weight: FontWeight.Bold, size: 40),
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                    },
-                };
-
-                parentContainers.Add(parentContainer);
-                childContainers.Add(childContainer);
-                texts.Add(text);
-                Cell(i).Add(cellInfo);
-                Cell(i).Add(parentContainer);
-            }
-        }
-
-        [Test]
-        public void TestResizeText()
-        {
-            AddStep("reset...", () =>
-            {
-                childContainers[0].GrowToFitContent = false;
-                childContainers[1].GrowToFitContent = false;
-            });
-
-            AddStep("setup...", () =>
-            {
-                childContainers[0].GrowToFitContent = true;
-                childContainers[1].GrowToFitContent = false;
-            });
-
-            for (int i = 0; i < 10; i++)
-            {
-                AddStep("Add Character", () =>
-                {
-                    foreach (int j in Enumerable.Range(0, parentContainers.Count))
-                    {
-                        texts[j].Text += ".";
-                    }
-                });
-            }
-
-            for (int i = 0; i < 10; i++)
-            {
-                AddStep("Remove Character", () =>
-                {
-                    foreach (int j in Enumerable.Range(0, parentContainers.Count))
-                    {
-                        string text = texts[j].Text.ToString();
-                        texts[j].Text = text.Remove(text.Length - 1, 1);
-                    }
-                });
-            }
-        }
-
-        [Test]
-        public void TestScaleText()
-        {
-            AddStep("reset...", () =>
-            {
-                childContainers[0].GrowToFitContent = false;
-                childContainers[1].GrowToFitContent = false;
-            });
-
-            AddStep("setup...", () =>
-            {
-                childContainers[0].GrowToFitContent = true;
-                childContainers[1].GrowToFitContent = false;
-            });
-
-            for (int i = 0; i < 1; i++)
-            {
-                AddStep("Big text", scaleUp);
-
-                AddWaitStep("wait...", 5);
-
-                AddStep("Small text", scaleDown);
-            }
-        }
-
-        private void scaleUp()
-        {
-            foreach (int j in Enumerable.Range(0, parentContainers.Count))
-            {
-                texts[j].ScaleTo(new Vector2(2, 2), 1000);
-            }
-        }
-
-        private void scaleDown()
-        {
-            foreach (int j in Enumerable.Range(0, parentContainers.Count))
-            {
-                texts[j].ScaleTo(new Vector2(1, 1), 1000);
-            }
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
new file mode 100644
index 0000000000..a5e70a54f8
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
@@ -0,0 +1,96 @@
+// 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.
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneSizePreservingSpriteText : OsuGridTestScene
+    {
+        private readonly List<Container> parentContainers = new List<Container>();
+        private readonly List<UprightAspectMaintainingContainer> childContainers = new List<UprightAspectMaintainingContainer>();
+        private readonly OsuSpriteText osuSpriteText = new OsuSpriteText();
+        private readonly SizePreservingSpriteText sizePreservingSpriteText = new SizePreservingSpriteText();
+
+
+        public TestSceneSizePreservingSpriteText()
+            : base(1, 2)
+        {
+            for (int i = 0; i < 2; i++)
+            {
+                UprightAspectMaintainingContainer childContainer;
+                Container parentContainer = new Container
+                {
+                    Origin = Anchor.BottomRight,
+                    Anchor = Anchor.BottomCentre,
+                    AutoSizeAxes = Axes.Both,
+                    Rotation = 45,
+                    Y = -200,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Colour4.Red,
+                        },
+                        childContainer = new UprightAspectMaintainingContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Colour4.Blue,
+                                },
+                            }
+                        },
+                    }
+                };
+
+                Container cellInfo = new Container
+                {
+                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    Margin = new MarginPadding
+                    {
+                        Top = 100,
+                    },
+                    Child = new OsuSpriteText
+                    {
+                        Text = (i == 0) ? "OsuSpriteText" : "SizePreservingSpriteText",
+                        Font = OsuFont.GetFont(Typeface.Inter, weight: FontWeight.Bold, size: 40),
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                    },
+                };
+
+                parentContainers.Add(parentContainer);
+                childContainers.Add(childContainer);
+                Cell(i).Add(cellInfo);
+                Cell(i).Add(parentContainer);
+            }
+
+            childContainers[0].Add(osuSpriteText);
+            childContainers[1].Add(sizePreservingSpriteText);
+            osuSpriteText.Font = sizePreservingSpriteText.Font = OsuFont.GetFont(Typeface.Venera, weight: FontWeight.Bold, size: 20);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            osuSpriteText.Text = sizePreservingSpriteText.Text = DateTime.Now.ToString();
+        }
+    }
+}

From 921a9ef895f4e23f81775bb3f252c85916d9e670 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Wed, 31 Aug 2022 22:18:52 +0100
Subject: [PATCH 114/709] clean up

---
 .../Visual/UserInterface/TestSceneSizePreservingTextSprite.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
index a5e70a54f8..69f5015af6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics;
@@ -21,7 +22,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         private readonly OsuSpriteText osuSpriteText = new OsuSpriteText();
         private readonly SizePreservingSpriteText sizePreservingSpriteText = new SizePreservingSpriteText();
 
-
         public TestSceneSizePreservingSpriteText()
             : base(1, 2)
         {
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         protected override void Update()
         {
             base.Update();
-            osuSpriteText.Text = sizePreservingSpriteText.Text = DateTime.Now.ToString();
+            osuSpriteText.Text = sizePreservingSpriteText.Text = DateTime.Now.ToString(CultureInfo.InvariantCulture);
         }
     }
 }

From 7a8fa5c2e4364f3c50523f155674119c98ad6394 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Fri, 2 Sep 2022 09:56:00 +0100
Subject: [PATCH 115/709] Fix filenames mismatch

---
 ...eservingTextSprite.cs => TestSceneSizePreservingSpriteText.cs} | 0
 .../{SizePreservingTextSprite.cs => SizePreservingSpriteText.cs}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneSizePreservingTextSprite.cs => TestSceneSizePreservingSpriteText.cs} (100%)
 rename osu.Game/Graphics/Sprites/{SizePreservingTextSprite.cs => SizePreservingSpriteText.cs} (100%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs
similarity index 100%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingTextSprite.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs
diff --git a/osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs b/osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs
similarity index 100%
rename from osu.Game/Graphics/Sprites/SizePreservingTextSprite.cs
rename to osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs

From 40ff2d50dd6e51feefc17fb1a7bfbce0e18c2be1 Mon Sep 17 00:00:00 2001
From: Josh <43808099+josh-codes@users.noreply.github.com>
Date: Sat, 3 Sep 2022 02:31:58 +0800
Subject: [PATCH 116/709] Refactor UI and add drag support

---
 .../TestSceneCatchTouchInput.cs               |  2 -
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 58 ++++++++++++++-----
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
index 03d031a0a8..24afda4cfa 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
index 771902df65..dbc8a51d9c 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
 using osuTK.Graphics;
 using osuTK;
 using System.Collections.Generic;
+using osu.Framework.Logging;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -39,10 +40,13 @@ namespace osu.Game.Rulesets.Catch.UI
         private ArrowHitbox leftDashBox = null!;
         private ArrowHitbox rightDashBox = null!;
 
+        // Force input to be prossed even when hidden.
+        public override bool PropagatePositionalInputSubTree => true;
+        public override bool PropagateNonPositionalInputSubTree => true;
+
         [BackgroundDependencyLoader]
         private void load(CatchInputManager catchInputManager, OsuColour colours)
         {
-            Show();
             Debug.Assert(catchInputManager.KeyBindingContainer != null);
 
             keyBindingContainer = catchInputManager.KeyBindingContainer;
@@ -121,7 +125,7 @@ namespace osu.Game.Rulesets.Catch.UI
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             // Hide whenever the keyboard is used.
-            PopOut();
+            Hide();
             return false;
         }
 
@@ -143,19 +147,39 @@ namespace osu.Game.Rulesets.Catch.UI
             base.OnMouseUp(e);
         }
 
-        /* I plan to come back to this code to add touch support
-         * protected override void OnTouchMove(TouchMoveEvent e)
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            return true;
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            base.OnDragEnd(e);
+        }
+
+        protected override void OnDrag(DragEvent e)
+        {
+            // I'm not sure if this is posible but let's be safe
+            if (!trackedActions.ContainsKey(e.Button))
+                trackedActions.Add(e.Button, TouchCatchAction.None);
+
+            trackedActions[e.Button] = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
+            calculateActiveKeys();
+
+            base.OnDrag(e);
+        }
+        protected override void OnTouchMove(TouchMoveEvent e)
         {
             // I'm not sure if this is posible but let's be safe
             if (!trackedActions.ContainsKey(e.Touch.Source))
                 trackedActions.Add(e.Touch.Source, TouchCatchAction.None);
 
-            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.MousePosition);
+            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouchDownPosition);
 
             calculateActiveKeys();
 
             base.OnTouchMove(e);
-        }*/
+        }
 
         protected override bool OnTouchDown(TouchDownEvent e)
         {
@@ -189,7 +213,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void handleDown(object source, Vector2 position)
         {
-            PopIn();
+            Show();
 
             TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
 
@@ -217,8 +241,10 @@ namespace osu.Game.Rulesets.Catch.UI
             if (leftBox.Contains(inputPosition))
                 return TouchCatchAction.MoveLeft;
             if (rightBox.Contains(inputPosition))
+            {
+                Logger.Log(inputPosition.ToString());
                 return TouchCatchAction.MoveRight;
-
+            }
             return TouchCatchAction.None;
         }
 
@@ -255,20 +281,20 @@ namespace osu.Game.Rulesets.Catch.UI
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            overlay = new Box
-                            {
-                                Alpha = 0,
-                                Colour = colour.Multiply(1.4f).Darken(2.8f),
-                                Blending = BlendingParameters.Additive,
-                                Width = 1,
-                                RelativeSizeAxes = Axes.Both,
-                            },
                             new Box
                             {
                                 Alpha = 0.8f,
                                 Colour = colour,
                                 Width = 1,
                                 RelativeSizeAxes = Axes.Both,
+                            },
+                            overlay = new Box
+                            {
+                                Alpha = 0,
+                                Colour = colour.Multiply(1.4f),
+                                Blending = BlendingParameters.Additive,
+                                Width = 1,
+                                RelativeSizeAxes = Axes.Both,
                             }
                         }
                     }

From 534c40e18eb2911f449f1aa3016b4f3809057330 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Fri, 2 Sep 2022 23:07:30 +0200
Subject: [PATCH 117/709] Initial version

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 335d956e39..4332532df7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -5,9 +5,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
@@ -17,18 +19,39 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
-        internal const int MAX_DISPLAYED_JUDGEMENTS = 20;
-
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
         private const int spacing = 2;
-
         private readonly JudgementFlow judgementsFlow;
 
+        [SettingSource("Colour hit number", "number of coloured hits")]
+        public BindableNumber<int> HitCircleAmount { get; } = new BindableNumber<int>(20)
+        {
+            MinValue = 1,
+            MaxValue = 30,
+            Precision = 1
+        };
+
+        [SettingSource("Opacity", "Visibility of object")]
+        public BindableNumber<float> HitOpacity { get; } = new BindableNumber<float>(1)
+        {
+            MinValue = 0,
+            MaxValue = 1,
+            Precision = .01f
+        };
+
+        [SettingSource("Spacing", "space between hit colour circles")]
+        public BindableNumber<float> HitSpacing { get; } = new BindableNumber<float>(1)
+        {
+            MinValue = 0,
+            MaxValue = 1,
+            Precision = .01f
+        };
+
         public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
-            InternalChild = judgementsFlow = new JudgementFlow();
+            InternalChild = judgementsFlow = new JudgementFlow(HitCircleAmount.Value, HitOpacity.Value);
         }
 
         protected override void OnNewJudgement(JudgementResult judgement)
@@ -36,7 +59,15 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (!judgement.Type.IsScorable() || judgement.Type.IsBonus())
                 return;
 
-            judgementsFlow.Push(GetColourForHitResult(judgement.Type));
+            judgementsFlow.Push(GetColourForHitResult(judgement.Type), HitCircleAmount.Value);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + spacing) - spacing;
+            judgementsFlow.Alpha = HitOpacity.Value;
+            judgementsFlow.Spacing = new Vector2(0, HitSpacing.Value);
         }
 
         public override void Clear() => judgementsFlow.Clear();
@@ -45,21 +76,20 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
-            public JudgementFlow()
+            public JudgementFlow(int hitCircleAmount, float opacity)
             {
                 AutoSizeAxes = Axes.X;
-                Height = MAX_DISPLAYED_JUDGEMENTS * (drawable_judgement_size + spacing) - spacing;
                 Spacing = new Vector2(0, spacing);
                 Direction = FillDirection.Vertical;
                 LayoutDuration = animation_duration;
                 LayoutEasing = Easing.OutQuint;
             }
 
-            public void Push(Color4 colour)
+            public void Push(Color4 colour, int amount)
             {
                 Add(new HitErrorCircle(colour, drawable_judgement_size));
 
-                if (Children.Count > MAX_DISPLAYED_JUDGEMENTS)
+                if (Children.Count > amount)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
             }
         }

From 51061c3a12af4711314c6a945f96a5ec220844be Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Sat, 3 Sep 2022 01:27:22 +0200
Subject: [PATCH 118/709] Bug fixing and parameter adjustments

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 4332532df7..f3d2c84177 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -21,7 +21,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
     {
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
-        private const int spacing = 2;
         private readonly JudgementFlow judgementsFlow;
 
         [SettingSource("Colour hit number", "number of coloured hits")]
@@ -35,23 +34,23 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         [SettingSource("Opacity", "Visibility of object")]
         public BindableNumber<float> HitOpacity { get; } = new BindableNumber<float>(1)
         {
-            MinValue = 0,
+            MinValue = 0.01f,
             MaxValue = 1,
             Precision = .01f
         };
 
         [SettingSource("Spacing", "space between hit colour circles")]
-        public BindableNumber<float> HitSpacing { get; } = new BindableNumber<float>(1)
+        public BindableNumber<float> HitSpacing { get; } = new BindableNumber<float>(2)
         {
             MinValue = 0,
-            MaxValue = 1,
-            Precision = .01f
+            MaxValue = 10,
+            Precision = .1f
         };
 
         public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
-            InternalChild = judgementsFlow = new JudgementFlow(HitCircleAmount.Value, HitOpacity.Value);
+            InternalChild = judgementsFlow = new JudgementFlow();
         }
 
         protected override void OnNewJudgement(JudgementResult judgement)
@@ -65,9 +64,11 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + spacing) - spacing;
-            judgementsFlow.Alpha = HitOpacity.Value;
-            judgementsFlow.Spacing = new Vector2(0, HitSpacing.Value);
+            HitOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitOpacity.Value, true);
+            HitSpacing.BindValueChanged(_ => judgementsFlow.Spacing = new Vector2(0, HitSpacing.Value), true);
+            HitSpacing.BindValueChanged(_ => judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + HitSpacing.Value) - HitSpacing.Value, true);
+            HitCircleAmount.BindValueChanged(_ => judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + HitSpacing.Value) - HitSpacing.Value, true);
+            HitCircleAmount.BindValueChanged(_ => judgementsFlow.Clear(), true);
         }
 
         public override void Clear() => judgementsFlow.Clear();
@@ -76,10 +77,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
-            public JudgementFlow(int hitCircleAmount, float opacity)
+            public JudgementFlow()
             {
-                AutoSizeAxes = Axes.X;
-                Spacing = new Vector2(0, spacing);
+                Width = drawable_judgement_size;
                 Direction = FillDirection.Vertical;
                 LayoutDuration = animation_duration;
                 LayoutEasing = Easing.OutQuint;
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         internal class HitErrorCircle : Container
         {
             public bool IsRemoved { get; private set; }
-
             private readonly Circle circle;
 
             public HitErrorCircle(Color4 colour, int size)

From 161c54df1cf981fe000a35e8412153de0d9cc95a Mon Sep 17 00:00:00 2001
From: Josh <43808099+josh-codes@users.noreply.github.com>
Date: Sat, 3 Sep 2022 14:14:34 +0800
Subject: [PATCH 119/709] Refactor UI and add drag support

---
 osu.Game.Rulesets.Catch/UI/TouchInputField.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
index dbc8a51d9c..80453d6aa3 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osuTK.Graphics;
 using osuTK;
 using System.Collections.Generic;
-using osu.Framework.Logging;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -174,8 +173,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (!trackedActions.ContainsKey(e.Touch.Source))
                 trackedActions.Add(e.Touch.Source, TouchCatchAction.None);
 
-            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouchDownPosition);
-
+            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
             calculateActiveKeys();
 
             base.OnTouchMove(e);
@@ -183,7 +181,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool OnTouchDown(TouchDownEvent e)
         {
-            handleDown(e.Touch.Source, e.ScreenSpaceTouchDownPosition);
+            handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position);
             return true;
         }
 
@@ -241,10 +239,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (leftBox.Contains(inputPosition))
                 return TouchCatchAction.MoveLeft;
             if (rightBox.Contains(inputPosition))
-            {
-                Logger.Log(inputPosition.ToString());
                 return TouchCatchAction.MoveRight;
-            }
             return TouchCatchAction.None;
         }
 

From 0c6d8efa28ae40f6f5301c9e455baa34dde6b7d3 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Sun, 4 Sep 2022 17:24:12 +0200
Subject: [PATCH 120/709] Large code refactor, Implementation of shapes option
 drop down

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 111 +++++++++++++-----
 1 file changed, 81 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index f3d2c84177..9bc6cdbb9b 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -1,8 +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.
 
-#nullable disable
-
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
@@ -19,12 +18,12 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
+        private const int default_shape_alpha = 0;
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
-        private readonly JudgementFlow judgementsFlow;
 
-        [SettingSource("Colour hit number", "number of coloured hits")]
-        public BindableNumber<int> HitCircleAmount { get; } = new BindableNumber<int>(20)
+        [SettingSource("Hit error amount", "Number of hit error shapes")]
+        public BindableNumber<int> HitShapeCount { get; } = new BindableNumber<int>(20)
         {
             MinValue = 1,
             MaxValue = 30,
@@ -32,21 +31,26 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         };
 
         [SettingSource("Opacity", "Visibility of object")]
-        public BindableNumber<float> HitOpacity { get; } = new BindableNumber<float>(1)
+        public BindableNumber<float> HitShapeOpacity { get; } = new BindableNumber<float>(1)
         {
             MinValue = 0.01f,
             MaxValue = 1,
-            Precision = .01f
+            Precision = .01f,
         };
 
-        [SettingSource("Spacing", "space between hit colour circles")]
-        public BindableNumber<float> HitSpacing { get; } = new BindableNumber<float>(2)
+        [SettingSource("Spacing", "Space between hit error shapes")]
+        public BindableNumber<float> HitShapeSpacing { get; } = new BindableNumber<float>(2)
         {
             MinValue = 0,
             MaxValue = 10,
             Precision = .1f
         };
 
+        [SettingSource("Shape", "What shape to use for hit errors")]
+        public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>();
+
+        private readonly JudgementFlow judgementsFlow;
+
         public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
@@ -58,24 +62,36 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (!judgement.Type.IsScorable() || judgement.Type.IsBonus())
                 return;
 
-            judgementsFlow.Push(GetColourForHitResult(judgement.Type), HitCircleAmount.Value);
+            judgementsFlow.Push(GetColourForHitResult(judgement.Type), HitShapeCount.Value);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            HitOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitOpacity.Value, true);
-            HitSpacing.BindValueChanged(_ => judgementsFlow.Spacing = new Vector2(0, HitSpacing.Value), true);
-            HitSpacing.BindValueChanged(_ => judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + HitSpacing.Value) - HitSpacing.Value, true);
-            HitCircleAmount.BindValueChanged(_ => judgementsFlow.Height = HitCircleAmount.Value * (drawable_judgement_size + HitSpacing.Value) - HitSpacing.Value, true);
-            HitCircleAmount.BindValueChanged(_ => judgementsFlow.Clear(), true);
+            HitShapeOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitShapeOpacity.Value, true);
+            HitShapeSpacing.BindValueChanged(_ =>
+            {
+                judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
+                judgementsFlow.Spacing = new Vector2(0, HitShapeSpacing.Value);
+            }, true);
+            HitShapeCount.BindValueChanged(_ =>
+            {
+                judgementsFlow.Clear();
+                judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
+            }, true);
+            HitShape.BindValueChanged(_ =>
+            {
+                judgementsFlow.ValueParser = getShapeStyle(HitShape.Value);
+                judgementsFlow.Clear();
+            }, true);
         }
 
         public override void Clear() => judgementsFlow.Clear();
 
-        private class JudgementFlow : FillFlowContainer<HitErrorCircle>
+        private class JudgementFlow : FillFlowContainer<HitErrorShape>
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
+            internal string ValueParser = null!;
 
             public JudgementFlow()
             {
@@ -85,38 +101,52 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 LayoutEasing = Easing.OutQuint;
             }
 
-            public void Push(Color4 colour, int amount)
+            public void Push(Color4 colour, int maxErrorShapeCount)
             {
-                Add(new HitErrorCircle(colour, drawable_judgement_size));
+                Add(new HitErrorShape(colour, drawable_judgement_size, ValueParser));
 
-                if (Children.Count > amount)
+                if (Children.Count > maxErrorShapeCount)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
             }
         }
 
-        internal class HitErrorCircle : Container
+        private class HitErrorShape : Container
         {
             public bool IsRemoved { get; private set; }
-            private readonly Circle circle;
 
-            public HitErrorCircle(Color4 colour, int size)
+            public HitErrorShape(Color4 colour, int size, string shape)
             {
                 Size = new Vector2(size);
-                Child = circle = new Circle
+
+                switch (shape)
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    Colour = colour
-                };
+                    case "circle":
+                        Child = new Circle
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = default_shape_alpha,
+                            Colour = colour
+                        };
+                        break;
+
+                    case "square":
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = default_shape_alpha,
+                            Colour = colour
+                        };
+                        break;
+                }
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
-                circle.FadeInFromZero(animation_duration, Easing.OutQuint);
-                circle.MoveToY(-DrawSize.Y);
-                circle.MoveToY(0, animation_duration, Easing.OutQuint);
+                Child.FadeInFromZero(animation_duration, Easing.OutQuint);
+                Child.MoveToY(-DrawSize.Y);
+                Child.MoveToY(0, animation_duration, Easing.OutQuint);
             }
 
             public void Remove()
@@ -126,5 +156,26 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 this.FadeOut(animation_duration, Easing.OutQuint).Expire();
             }
         }
+
+        private string getShapeStyle(ShapeStyle shape)
+        {
+            switch (shape)
+            {
+                case ShapeStyle.Circle:
+                    return "circle";
+
+                case ShapeStyle.Square:
+                    return "square";
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(shape), shape, @"Unsupported animation style");
+            }
+        }
+
+        public enum ShapeStyle
+        {
+            Circle,
+            Square
+        }
     }
 }

From 5f0832ead72c9964cdc40fa00b01f260ffa5a1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 01:58:57 +0900
Subject: [PATCH 121/709] refactor(osu.Game): separate `OsuColour.ForHitResult`
 by usage

---
 osu.Game/Graphics/OsuColour.cs                | 30 ++++++++++++++++++-
 .../Leaderboards/LeaderboardScoreTooltip.cs   |  2 +-
 .../Judgements/DefaultJudgementPiece.cs       |  2 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  | 25 +---------------
 .../Expanded/Statistics/HitResultStatistic.cs |  2 +-
 5 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 6e2f460930..022b1a363f 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Graphics
         /// <summary>
         /// Retrieves the colour for a <see cref="HitResult"/>.
         /// </summary>
-        public Color4 ForHitResult(HitResult judgement)
+        public Color4 TextForHitResult(HitResult judgement)
         {
             switch (judgement)
             {
@@ -125,6 +125,34 @@ namespace osu.Game.Graphics
             }
         }
 
+        public Color4 DrawForHitResult(HitResult result)
+        {
+            switch (result)
+            {
+                case HitResult.SmallTickMiss:
+                case HitResult.LargeTickMiss:
+                case HitResult.Miss:
+                    return Red;
+
+                case HitResult.Meh:
+                    return Yellow;
+
+                case HitResult.Ok:
+                    return Green;
+
+                case HitResult.Good:
+                    return GreenLight;
+
+                case HitResult.SmallTickHit:
+                case HitResult.LargeTickHit:
+                case HitResult.Great:
+                    return Blue;
+
+                default:
+                    return BlueLight;
+            }
+        }
+
         /// <summary>
         /// Retrieves a colour for the given <see cref="BeatmapOnlineStatus"/>.
         /// A <see langword="null"/> value indicates that a "background" shade from the local <see cref="OverlayColourProvider"/>
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 2f3ece0e3b..23d4e64191 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Online.Leaderboards
                         {
                             Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
                             Text = displayName.ToUpper(),
-                            Colour = colours.ForHitResult(result),
+                            Colour = colours.TextForHitResult(result),
                         },
                         new OsuSpriteText
                         {
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index c2b27d4ce8..a854bf37f5 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Judgements
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Text = Result.GetDescription().ToUpperInvariant(),
-                    Colour = colours.ForHitResult(Result),
+                    Colour = colours.TextForHitResult(Result),
                     Font = OsuFont.Numeric.With(size: 20),
                     Scale = new Vector2(0.85f, 1),
                 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 26befd659c..35d28b8e98 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -59,30 +59,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         protected Color4 GetColourForHitResult(HitResult result)
         {
-            switch (result)
-            {
-                case HitResult.SmallTickMiss:
-                case HitResult.LargeTickMiss:
-                case HitResult.Miss:
-                    return colours.Red;
-
-                case HitResult.Meh:
-                    return colours.Yellow;
-
-                case HitResult.Ok:
-                    return colours.Green;
-
-                case HitResult.Good:
-                    return colours.GreenLight;
-
-                case HitResult.SmallTickHit:
-                case HitResult.LargeTickHit:
-                case HitResult.Great:
-                    return colours.Blue;
-
-                default:
-                    return colours.BlueLight;
-            }
+            return colours.DrawForHitResult(result);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index c23a5e668d..429b72c07c 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            HeaderText.Colour = colours.ForHitResult(Result);
+            HeaderText.Colour = colours.TextForHitResult(Result);
         }
     }
 }

From 074d2a7a3a64cb09b566e51399450da57bbc455e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 02:01:44 +0900
Subject: [PATCH 122/709] chore(osu.Game): provide ordering index for
 `HitResult`

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 5047fdea82..8078363212 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -4,10 +4,12 @@
 #nullable disable
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Serialization;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Utils;
 
 namespace osu.Game.Rulesets.Scoring
@@ -135,6 +137,8 @@ namespace osu.Game.Rulesets.Scoring
 #pragma warning disable CS0618
     public static class HitResultExtensions
     {
+        private static readonly IList<HitResult> order = EnumExtensions.GetValuesInOrder<HitResult>().ToList();
+
         /// <summary>
         /// Whether a <see cref="HitResult"/> increases the combo.
         /// </summary>
@@ -282,6 +286,16 @@ namespace osu.Game.Rulesets.Scoring
             Debug.Assert(minResult <= maxResult);
             return result > minResult && result < maxResult;
         }
+
+        /// <summary>
+        /// Ordered index of a <see cref="HitResult"/>. Used for sorting.
+        /// </summary>
+        /// <param name="result">The <see cref="HitResult"/> to get the index of.</param>
+        /// <returns>The index of <paramref name="result"/>.</returns>
+        public static int OrderingIndex(this HitResult result)
+        {
+            return order.IndexOf(result);
+        }
     }
 #pragma warning restore CS0618
 }

From 0af6b3dc0fa41e65480c670c7a8dbc53f11f6de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 02:02:38 +0900
Subject: [PATCH 123/709] chore(osu.Game): colorize bars by OD on
 `HitEventTimingDistributionGraph`

---
 .../HitEventTimingDistributionGraph.cs        | 109 ++++++++++++++----
 1 file changed, 84 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index db69e270f6..3a696290b9 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -48,6 +47,9 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         private readonly IReadOnlyList<HitEvent> hitEvents;
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="HitEventTimingDistributionGraph"/>.
         /// </summary>
@@ -57,7 +59,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
         }
 
-        private int[] bins;
+        private IDictionary<HitResult, int>[] bins;
         private double binSize;
         private double hitOffset;
 
@@ -69,7 +71,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             if (hitEvents == null || hitEvents.Count == 0)
                 return;
 
-            bins = new int[total_timing_distribution_bins];
+            bins = Enumerable.Range(0, total_timing_distribution_bins).Select(_ => new Dictionary<HitResult, int>()).ToArray<IDictionary<HitResult, int>>();
 
             binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins);
 
@@ -89,7 +91,8 @@ namespace osu.Game.Screens.Ranking.Statistics
         {
             bool roundUp = true;
 
-            Array.Clear(bins, 0, bins.Length);
+            foreach (var bin in bins)
+                bin.Clear();
 
             foreach (var e in hitEvents)
             {
@@ -110,23 +113,29 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                 // may be out of range when applying an offset. for such cases we can just drop the results.
                 if (index >= 0 && index < bins.Length)
-                    bins[index]++;
+                {
+                    bins[index].TryGetValue(e.Result, out int value);
+                    bins[index][e.Result] = ++value;
+                }
             }
 
             if (barDrawables != null)
             {
                 for (int i = 0; i < barDrawables.Length; i++)
                 {
-                    barDrawables[i].UpdateOffset(bins[i]);
+                    barDrawables[i].UpdateOffset(bins[i].Sum(b => b.Value));
                 }
             }
             else
             {
-                int maxCount = bins.Max();
+                int maxCount = bins.Max(b => b.Values.Sum());
                 barDrawables = new Bar[total_timing_distribution_bins];
 
                 for (int i = 0; i < barDrawables.Length; i++)
-                    barDrawables[i] = new Bar(bins[i], maxCount, i == timing_distribution_centre_bin_index);
+                {
+                    IReadOnlyList<BarValue> values = bins[i].Select(b => new BarValue(b.Key.OrderingIndex(), b.Value, colours.DrawForHitResult(b.Key))).OrderBy(b => b.Index).ToList();
+                    barDrawables[i] = new Bar(values, maxCount, i == timing_distribution_centre_bin_index);
+                }
 
                 Container axisFlow;
 
@@ -207,52 +216,102 @@ namespace osu.Game.Screens.Ranking.Statistics
             }
         }
 
+        private readonly struct BarValue
+        {
+            public readonly int Index;
+            public readonly float Value;
+            public readonly Color4 Colour;
+
+            public BarValue(int index, float value, Color4 colour)
+            {
+                Index = index;
+                Value = value;
+                Colour = colour;
+            }
+        }
+
         private class Bar : CompositeDrawable
         {
-            private readonly float value;
+            private float totalValue => values.Sum(v => v.Value);
+            private float basalHeight => BoundingBox.Width / BoundingBox.Height;
+            private float availableHeight => 1 - basalHeight;
+
+            private readonly IReadOnlyList<BarValue> values;
             private readonly float maxValue;
 
-            private readonly Circle boxOriginal;
+            private readonly Circle[] boxOriginals;
             private Circle boxAdjustment;
 
-            private const float minimum_height = 0.05f;
-
-            public Bar(float value, float maxValue, bool isCentre)
+            public Bar(IReadOnlyList<BarValue> values, float maxValue, bool isCentre)
             {
-                this.value = value;
+                this.values = values;
                 this.maxValue = maxValue;
 
                 RelativeSizeAxes = Axes.Both;
                 Masking = true;
 
-                InternalChildren = new Drawable[]
+                if (values.Any())
                 {
-                    boxOriginal = new Circle
+                    boxOriginals = values.Select(v => new Circle
                     {
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = isCentre ? Color4.White : Color4Extensions.FromHex("#66FFCC"),
-                        Height = minimum_height,
-                    },
-                };
+                        Colour = isCentre ? Color4.White : v.Colour,
+                        Height = 0,
+                    }).ToArray();
+                    InternalChildren = boxOriginals.Reverse().ToArray();
+                }
+                else
+                {
+                    InternalChildren = boxOriginals = new[]
+                    {
+                        new Circle
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            Colour = isCentre ? Color4.White : Color4.Gray,
+                            Height = 0,
+                        },
+                    };
+                }
             }
 
             private const double duration = 300;
 
+            private float offsetForValue(float value)
+            {
+                return availableHeight * value / maxValue;
+            }
+
+            private float heightForValue(float value)
+            {
+                return basalHeight + offsetForValue(value);
+            }
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
-                float height = Math.Clamp(value / maxValue, minimum_height, 1);
+                float offsetValue = 0;
 
-                if (height > minimum_height)
-                    boxOriginal.ResizeHeightTo(height, duration, Easing.OutQuint);
+                if (values.Any())
+                {
+                    for (int i = 0; i < values.Count; i++)
+                    {
+                        boxOriginals[i].Y = BoundingBox.Height * offsetForValue(offsetValue);
+                        boxOriginals[i].Delay(duration * i).ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
+                        offsetValue -= values[i].Value;
+                    }
+                }
+                else
+                    boxOriginals.Single().ResizeHeightTo(basalHeight, duration, Easing.OutQuint);
             }
 
             public void UpdateOffset(float adjustment)
             {
-                bool hasAdjustment = adjustment != value && adjustment / maxValue >= minimum_height;
+                bool hasAdjustment = adjustment != totalValue;
 
                 if (boxAdjustment == null)
                 {
@@ -271,7 +330,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                     });
                 }
 
-                boxAdjustment.ResizeHeightTo(Math.Clamp(adjustment / maxValue, minimum_height, 1), duration, Easing.OutQuint);
+                boxAdjustment.ResizeHeightTo(heightForValue(adjustment), duration, Easing.OutQuint);
                 boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
         }

From b67fd3d8804a6461943057fc0cf6fb0adf5fbcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 03:45:51 +0900
Subject: [PATCH 124/709] chore(osu.Game): split transform duration of bars on
 `HitTimingDistributionGraph`

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 3a696290b9..900fd2c907 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -278,7 +278,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
             }
 
-            private const double duration = 300;
+            private const double total_duration = 300;
+
+            private double duration => total_duration / Math.Max(values.Count, 1);
 
             private float offsetForValue(float value)
             {

From 19ab1433c67b06b1a9f08bf5b64c14abcee5647d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 03:46:23 +0900
Subject: [PATCH 125/709] test(osu.Game): add more test cases for
 `HitTimingDistributionGraph`

---
 ...estSceneHitEventTimingDistributionGraph.cs | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 44cb438a6b..9264ed7030 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -43,6 +43,50 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
         }
 
+        [Test]
+        public void TestSparse()
+        {
+            createTest(new List<HitEvent>
+            {
+                new HitEvent(-7, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(-6, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(-5, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(5, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(6, HitResult.Perfect, placeholder_object, placeholder_object, null),
+                new HitEvent(7, HitResult.Perfect, placeholder_object, placeholder_object, null),
+            });
+        }
+
+        [Test]
+        public void TestVariousTypesOfHitResult()
+        {
+            createTest(CreateDistributedHitEvents(0, 50).Select(h =>
+            {
+                var offset = Math.Abs(h.TimeOffset);
+                var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
+                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+            }).ToList());
+        }
+
+        [Test]
+        public void TestMultipleWindowsOfHitResult()
+        {
+            var wide = CreateDistributedHitEvents(0, 50).Select(h =>
+            {
+                var offset = Math.Abs(h.TimeOffset);
+                var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
+                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+            });
+            var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
+            {
+                var offset = Math.Abs(h.TimeOffset);
+                var result = offset > 25 ? HitResult.Miss : offset > 20 ? HitResult.Meh : offset > 15 ? HitResult.Ok : offset > 10 ? HitResult.Good : offset > 5 ? HitResult.Great : HitResult.Perfect;
+                return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
+            });
+            createTest(wide.Concat(narrow).ToList());
+        }
+
+
         [Test]
         public void TestZeroTimeOffset()
         {

From 7e77c9e8b47e87fa181db6912bfbc9a541f278d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 04:44:27 +0900
Subject: [PATCH 126/709] chore(osu.Game): only the first result should be
 white at zero position on `HitEventTimingDistributionGraph`

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 900fd2c907..1be32a94af 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -252,12 +252,12 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                 if (values.Any())
                 {
-                    boxOriginals = values.Select(v => new Circle
+                    boxOriginals = values.Select((v, i) => new Circle
                     {
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = isCentre ? Color4.White : v.Colour,
+                        Colour = isCentre && i == 0 ? Color4.White : v.Colour,
                         Height = 0,
                     }).ToArray();
                     InternalChildren = boxOriginals.Reverse().ToArray();

From 4ea7ca4c0748f1cead8465b6448510136255c289 Mon Sep 17 00:00:00 2001
From: Exanc <43091560+Exanc@users.noreply.github.com>
Date: Mon, 5 Sep 2022 00:09:20 +0200
Subject: [PATCH 127/709] Slight tweak to the StarsSlider

 - MinimumStarsSlider now shows "0" when at it's minimum
 - Modified and NoResultsPlaceholder the tooltip to stay consistent with the changes
---
 .../Select/DifficultyRangeFilterControl.cs        | 15 ++++++++++++++-
 osu.Game/Screens/Select/NoResultsPlaceholder.cs   |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
index a82c969805..eb5a797ac0 100644
--- a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
+++ b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
@@ -65,6 +65,10 @@ namespace osu.Game.Screens.Select
 
         private class MinimumStarsSlider : StarsSlider
         {
+            public MinimumStarsSlider() : base("0") { }
+
+            public override LocalisableString TooltipText => Current.Value.ToString(@"0.## stars");
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
@@ -82,6 +86,8 @@ namespace osu.Game.Screens.Select
 
         private class MaximumStarsSlider : StarsSlider
         {
+            public MaximumStarsSlider() : base("∞") { }
+
             protected override void LoadComplete()
             {
                 base.LoadComplete();
@@ -100,6 +106,13 @@ namespace osu.Game.Screens.Select
                 ? UserInterfaceStrings.NoLimit
                 : Current.Value.ToString(@"0.## stars");
 
+            protected readonly string DefaultValue;
+
+            public StarsSlider(string defaultValue)
+            {
+                DefaultValue = defaultValue;
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 base.OnHover(e);
@@ -125,7 +138,7 @@ namespace osu.Game.Screens.Select
 
                 Current.BindValueChanged(current =>
                 {
-                    currentDisplay.Text = current.NewValue != Current.Default ? current.NewValue.ToString("N1") : "∞";
+                    currentDisplay.Text = current.NewValue != Current.Default ? current.NewValue.ToString("N1") : DefaultValue;
                 }, true);
             }
         }
diff --git a/osu.Game/Screens/Select/NoResultsPlaceholder.cs b/osu.Game/Screens/Select/NoResultsPlaceholder.cs
index f3c3fb4d87..f44aa01588 100644
--- a/osu.Game/Screens/Select/NoResultsPlaceholder.cs
+++ b/osu.Game/Screens/Select/NoResultsPlaceholder.cs
@@ -127,10 +127,10 @@ namespace osu.Game.Screens.Select
                         config.SetValue(OsuSetting.DisplayStarsMaximum, 10.1);
                     });
 
-                    string lowerStar = filter.UserStarDifficulty.Min == null ? "∞" : $"{filter.UserStarDifficulty.Min:N1}";
+                    string lowerStar = filter.UserStarDifficulty.Min == null ? "0,0" : $"{filter.UserStarDifficulty.Min:N1}";
                     string upperStar = filter.UserStarDifficulty.Max == null ? "∞" : $"{filter.UserStarDifficulty.Max:N1}";
 
-                    textFlow.AddText($" the {lowerStar}-{upperStar} star difficulty filter.");
+                    textFlow.AddText($" the {lowerStar} - {upperStar} star difficulty filter.");
                 }
 
                 // TODO: Add realm queries to hint at which ruleset results are available in (and allow clicking to switch).

From aace334fb365485ed41e809d19d34961b57d6920 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Mon, 5 Sep 2022 04:49:48 +0200
Subject: [PATCH 128/709] Fix some test issues

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 22 +++++++++----------
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 707f807e64..74387e1d8e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -107,13 +107,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddAssert("circle added", () =>
                 this.ChildrenOfType<ColourHitErrorMeter>().All(
-                    meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Count() == 1));
+                    meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() == 1));
 
             AddStep("miss", () => newJudgement(50, HitResult.Miss));
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddAssert("circle added", () =>
                 this.ChildrenOfType<ColourHitErrorMeter>().All(
-                    meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Count() == 2));
+                    meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() == 2));
         }
 
         [Test]
@@ -123,11 +123,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("small bonus", () => newJudgement(result: HitResult.SmallBonus));
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
 
             AddStep("large bonus", () => newJudgement(result: HitResult.LargeBonus));
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
         }
 
         [Test]
@@ -137,11 +137,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("ignore hit", () => newJudgement(result: HitResult.IgnoreHit));
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
 
             AddStep("ignore miss", () => newJudgement(result: HitResult.IgnoreMiss));
             AddAssert("no bars added", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("no circle added", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
         }
 
         [Test]
@@ -155,16 +155,16 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hitErrorMeter.Hide();
             });
 
-            AddRepeatStep("hit", () => newJudgement(), ColourHitErrorMeter.MAX_DISPLAYED_JUDGEMENTS * 2);
+            AddRepeatStep("hit", () => newJudgement(), ColourHitErrorMeter.HitErrorShape. *2);
 
             AddAssert("bars added", () => this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("circle added", () => this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("circle added", () => this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
 
             AddUntilStep("wait for bars to disappear", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddUntilStep("ensure max circles not exceeded", () =>
             {
                 return this.ChildrenOfType<ColourHitErrorMeter>()
-                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Count() <= ColourHitErrorMeter.MAX_DISPLAYED_JUDGEMENTS);
+                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= ColourHitErrorMeter.HitShapeCount.Default);
             });
 
             AddStep("show displays", () =>
@@ -183,12 +183,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("bar added", () => this.ChildrenOfType<BarHitErrorMeter>().All(
                 meter => meter.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Count() == 1));
             AddAssert("circle added", () => this.ChildrenOfType<ColourHitErrorMeter>().All(
-                meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Count() == 1));
+                meter => meter.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() == 1));
 
             AddStep("clear", () => this.ChildrenOfType<HitErrorMeter>().ForEach(meter => meter.Clear()));
 
             AddAssert("bar cleared", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
-            AddAssert("colour cleared", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorCircle>().Any());
+            AddAssert("colour cleared", () => !this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
         }
 
         private void recreateDisplay(HitWindows hitWindows, float overallDifficulty)
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 9bc6cdbb9b..8901612b9b 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }
         }
 
-        private class HitErrorShape : Container
+        public class HitErrorShape : Container
         {
             public bool IsRemoved { get; private set; }
 

From 6946015d17fe0f6feddcc5e5e3a974cc39bc54d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 5 Sep 2022 07:49:29 +0000
Subject: [PATCH 129/709] style(osu.Game): fix multiple blank lines

---
 .../Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 9264ed7030..fe4aba1317 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -86,7 +86,6 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(wide.Concat(narrow).ToList());
         }
 
-
         [Test]
         public void TestZeroTimeOffset()
         {

From 2923c10cd808f555375c081b008a4558460ec4e9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 1 Sep 2022 18:53:35 +0900
Subject: [PATCH 130/709] Rewrite rooms to store multiple active countdowns

Update test to the new structure
---
 .../Multiplayer/TestSceneMatchStartControl.cs | 15 ++++++----
 .../Countdown/CountdownChangedEvent.cs        | 20 -------------
 .../Countdown/CountdownStartedEvent.cs        | 28 +++++++++++++++++++
 .../Countdown/CountdownStoppedEvent.cs        | 28 +++++++++++++++++++
 .../Countdown/StopCountdownRequest.cs         | 10 +++++++
 .../Online/Multiplayer/MatchServerEvent.cs    |  3 +-
 .../Online/Multiplayer/MultiplayerClient.cs   | 10 +++++--
 .../Multiplayer/MultiplayerCountdown.cs       | 10 +++++--
 .../Online/Multiplayer/MultiplayerRoom.cs     |  4 +--
 osu.Game/Online/SignalRWorkaroundTypes.cs     |  3 +-
 .../Multiplayer/Match/MatchStartControl.cs    | 10 +++++--
 .../Match/MultiplayerCountdownButton.cs       |  5 ++--
 .../Match/MultiplayerReadyButton.cs           | 25 ++++++-----------
 13 files changed, 117 insertions(+), 54 deletions(-)
 delete mode 100644 osu.Game/Online/Multiplayer/Countdown/CountdownChangedEvent.cs
 create mode 100644 osu.Game/Online/Multiplayer/Countdown/CountdownStartedEvent.cs
 create mode 100644 osu.Game/Online/Multiplayer/Countdown/CountdownStoppedEvent.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
index a800b21bc9..12e7394c93 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
@@ -91,8 +91,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                          break;
 
                                      case StopCountdownRequest:
-                                         multiplayerRoom.Countdown = null;
-                                         raiseRoomUpdated();
+                                         clearRoomCountdown();
                                          break;
                                  }
                              });
@@ -244,14 +243,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
 
             AddStep("start countdown", () => multiplayerClient.Object.SendMatchRequest(new StartMatchCountdownRequest { Duration = TimeSpan.FromMinutes(1) }).WaitSafely());
-            AddUntilStep("countdown started", () => multiplayerRoom.Countdown != null);
+            AddUntilStep("countdown started", () => multiplayerRoom.ActiveCountdowns.Any());
 
             AddStep("transfer host to local user", () => transferHost(localUser));
             AddUntilStep("local user is host", () => multiplayerRoom.Host?.Equals(multiplayerClient.Object.LocalUser) == true);
 
             ClickButtonWhenEnabled<MultiplayerReadyButton>();
             checkLocalUserState(MultiplayerUserState.Ready);
-            AddAssert("countdown still active", () => multiplayerRoom.Countdown != null);
+            AddAssert("countdown still active", () => multiplayerRoom.ActiveCountdowns.Any());
         }
 
         [Test]
@@ -392,7 +391,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void setRoomCountdown(TimeSpan duration)
         {
-            multiplayerRoom.Countdown = new MatchStartCountdown { TimeRemaining = duration };
+            multiplayerRoom.ActiveCountdowns.Add(new MatchStartCountdown { TimeRemaining = duration });
+            raiseRoomUpdated();
+        }
+
+        private void clearRoomCountdown()
+        {
+            multiplayerRoom.ActiveCountdowns.Clear();
             raiseRoomUpdated();
         }
 
diff --git a/osu.Game/Online/Multiplayer/Countdown/CountdownChangedEvent.cs b/osu.Game/Online/Multiplayer/Countdown/CountdownChangedEvent.cs
deleted file mode 100644
index 649e3c8389..0000000000
--- a/osu.Game/Online/Multiplayer/Countdown/CountdownChangedEvent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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 MessagePack;
-
-namespace osu.Game.Online.Multiplayer.Countdown
-{
-    /// <summary>
-    /// Indicates a change to the <see cref="MultiplayerRoom"/>'s countdown.
-    /// </summary>
-    [MessagePackObject]
-    public class CountdownChangedEvent : MatchServerEvent
-    {
-        /// <summary>
-        /// The new countdown.
-        /// </summary>
-        [Key(0)]
-        public MultiplayerCountdown? Countdown { get; set; }
-    }
-}
diff --git a/osu.Game/Online/Multiplayer/Countdown/CountdownStartedEvent.cs b/osu.Game/Online/Multiplayer/Countdown/CountdownStartedEvent.cs
new file mode 100644
index 0000000000..1dbb27bce6
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/Countdown/CountdownStartedEvent.cs
@@ -0,0 +1,28 @@
+// 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 MessagePack;
+using Newtonsoft.Json;
+
+namespace osu.Game.Online.Multiplayer.Countdown
+{
+    /// <summary>
+    /// Indicates that a countdown started in the <see cref="MultiplayerRoom"/>.
+    /// </summary>
+    [MessagePackObject]
+    public class CountdownStartedEvent : MatchServerEvent
+    {
+        /// <summary>
+        /// The countdown that was started.
+        /// </summary>
+        [Key(0)]
+        public readonly MultiplayerCountdown Countdown;
+
+        [JsonConstructor]
+        [SerializationConstructor]
+        public CountdownStartedEvent(MultiplayerCountdown countdown)
+        {
+            Countdown = countdown;
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/Countdown/CountdownStoppedEvent.cs b/osu.Game/Online/Multiplayer/Countdown/CountdownStoppedEvent.cs
new file mode 100644
index 0000000000..b46ed0e5e0
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/Countdown/CountdownStoppedEvent.cs
@@ -0,0 +1,28 @@
+// 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 MessagePack;
+using Newtonsoft.Json;
+
+namespace osu.Game.Online.Multiplayer.Countdown
+{
+    /// <summary>
+    /// Indicates that a countdown was stopped in the <see cref="MultiplayerRoom"/>.
+    /// </summary>
+    [MessagePackObject]
+    public class CountdownStoppedEvent : MatchServerEvent
+    {
+        /// <summary>
+        /// The identifier of the countdown that was stopped.
+        /// </summary>
+        [Key(0)]
+        public readonly int ID;
+
+        [JsonConstructor]
+        [SerializationConstructor]
+        public CountdownStoppedEvent(int id)
+        {
+            ID = id;
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/Countdown/StopCountdownRequest.cs b/osu.Game/Online/Multiplayer/Countdown/StopCountdownRequest.cs
index bd0c381c0b..495252c044 100644
--- a/osu.Game/Online/Multiplayer/Countdown/StopCountdownRequest.cs
+++ b/osu.Game/Online/Multiplayer/Countdown/StopCountdownRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using MessagePack;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.Multiplayer.Countdown
 {
@@ -11,5 +12,14 @@ namespace osu.Game.Online.Multiplayer.Countdown
     [MessagePackObject]
     public class StopCountdownRequest : MatchUserRequest
     {
+        [Key(0)]
+        public readonly int ID;
+
+        [JsonConstructor]
+        [SerializationConstructor]
+        public StopCountdownRequest(int id)
+        {
+            ID = id;
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MatchServerEvent.cs b/osu.Game/Online/Multiplayer/MatchServerEvent.cs
index 20bf9e5141..376ff4d261 100644
--- a/osu.Game/Online/Multiplayer/MatchServerEvent.cs
+++ b/osu.Game/Online/Multiplayer/MatchServerEvent.cs
@@ -13,7 +13,8 @@ namespace osu.Game.Online.Multiplayer
     [Serializable]
     [MessagePackObject]
     // IMPORTANT: Add rules to SignalRUnionWorkaroundResolver for new derived types.
-    [Union(0, typeof(CountdownChangedEvent))]
+    [Union(0, typeof(CountdownStartedEvent))]
+    [Union(1, typeof(CountdownStoppedEvent))]
     public abstract class MatchServerEvent
     {
     }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 04b87c19da..5575113a87 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -550,8 +550,14 @@ namespace osu.Game.Online.Multiplayer
 
                 switch (e)
                 {
-                    case CountdownChangedEvent countdownChangedEvent:
-                        Room.Countdown = countdownChangedEvent.Countdown;
+                    case CountdownStartedEvent countdownStartedEvent:
+                        Room.ActiveCountdowns.Add(countdownStartedEvent.Countdown);
+                        break;
+
+                    case CountdownStoppedEvent countdownStoppedEvent:
+                        MultiplayerCountdown? countdown = Room.ActiveCountdowns.FirstOrDefault(countdown => countdown.ID == countdownStoppedEvent.ID);
+                        if (countdown != null)
+                            Room.ActiveCountdowns.Remove(countdown);
                         break;
                 }
 
diff --git a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
index 621f9236fd..00bfa8919a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
@@ -15,13 +15,19 @@ namespace osu.Game.Online.Multiplayer
     [Union(1, typeof(ForceGameplayStartCountdown))]
     public abstract class MultiplayerCountdown
     {
+        /// <summary>
+        /// A unique identifier for this countdown.
+        /// </summary>
+        [Key(0)]
+        public int ID { get; set; }
+
         /// <summary>
         /// The amount of time remaining in the countdown.
         /// </summary>
         /// <remarks>
-        /// This is only sent once from the server upon initial retrieval of the <see cref="MultiplayerRoom"/> or via a <see cref="CountdownChangedEvent"/>.
+        /// This is only sent once from the server upon initial retrieval of the <see cref="MultiplayerRoom"/> or via a <see cref="CountdownStartedEvent"/>.
         /// </remarks>
-        [Key(0)]
+        [Key(1)]
         public TimeSpan TimeRemaining { get; set; }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index fb05c03256..00048fa931 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -53,10 +53,10 @@ namespace osu.Game.Online.Multiplayer
         public IList<MultiplayerPlaylistItem> Playlist { get; set; } = new List<MultiplayerPlaylistItem>();
 
         /// <summary>
-        /// The currently-running countdown.
+        /// The currently running countdowns.
         /// </summary>
         [Key(7)]
-        public MultiplayerCountdown? Countdown { get; set; }
+        public IList<MultiplayerCountdown> ActiveCountdowns { get; set; } = new List<MultiplayerCountdown>();
 
         [JsonConstructor]
         [SerializationConstructor]
diff --git a/osu.Game/Online/SignalRWorkaroundTypes.cs b/osu.Game/Online/SignalRWorkaroundTypes.cs
index 29e01e13ae..3518fbb4fe 100644
--- a/osu.Game/Online/SignalRWorkaroundTypes.cs
+++ b/osu.Game/Online/SignalRWorkaroundTypes.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Online
             (typeof(ChangeTeamRequest), typeof(MatchUserRequest)),
             (typeof(StartMatchCountdownRequest), typeof(MatchUserRequest)),
             (typeof(StopCountdownRequest), typeof(MatchUserRequest)),
-            (typeof(CountdownChangedEvent), typeof(MatchServerEvent)),
+            (typeof(CountdownStartedEvent), typeof(MatchServerEvent)),
+            (typeof(CountdownStoppedEvent), typeof(MatchServerEvent)),
             (typeof(TeamVersusRoomState), typeof(MatchRoomState)),
             (typeof(TeamVersusUserState), typeof(MatchUserState)),
             (typeof(MatchStartCountdown), typeof(MultiplayerCountdown)),
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
index 501c76f65b..f048ae59cd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MatchStartControl.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             Debug.Assert(clickOperation == null);
             clickOperation = ongoingOperationTracker.BeginOperation();
 
-            if (isReady() && Client.IsHost && Room.Countdown == null)
+            if (isReady() && Client.IsHost && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
                 startMatch();
             else
                 toggleReady();
@@ -140,10 +140,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void cancelCountdown()
         {
+            if (Client.Room == null)
+                return;
+
             Debug.Assert(clickOperation == null);
             clickOperation = ongoingOperationTracker.BeginOperation();
 
-            Client.SendMatchRequest(new StopCountdownRequest()).ContinueWith(_ => endOperation());
+            MultiplayerCountdown countdown = Client.Room.ActiveCountdowns.Single(c => c is MatchStartCountdown);
+            Client.SendMatchRequest(new StopCountdownRequest(countdown.ID)).ContinueWith(_ => endOperation());
         }
 
         private void endOperation()
@@ -192,7 +196,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             // When the local user is the host and spectating the match, the ready button should be enabled only if any users are ready.
             if (localUser?.State == MultiplayerUserState.Spectating)
-                readyButton.Enabled.Value &= Client.IsHost && newCountReady > 0 && Room.Countdown == null;
+                readyButton.Enabled.Value &= Client.IsHost && newCountReady > 0 && !Room.ActiveCountdowns.Any(c => c is MatchStartCountdown);
 
             if (newCountReady == countReady)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
index 14bf1a8375..cd94b47d9e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerCountdownButton.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
@@ -79,7 +80,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void onRoomUpdated() => Scheduler.AddOnce(() =>
         {
-            bool countdownActive = multiplayerClient.Room?.Countdown is MatchStartCountdown;
+            bool countdownActive = multiplayerClient.Room?.ActiveCountdowns.Any(c => c is MatchStartCountdown) == true;
 
             if (countdownActive)
             {
@@ -121,7 +122,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 });
             }
 
-            if (multiplayerClient.Room?.Countdown != null && multiplayerClient.IsHost)
+            if (multiplayerClient.Room?.ActiveCountdowns.Any(c => c is MatchStartCountdown) == true && multiplayerClient.IsHost)
             {
                 flow.Add(new OsuButton
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index c5d6da1ebc..b4ff34cbc2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -57,23 +57,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void onRoomUpdated() => Scheduler.AddOnce(() =>
         {
-            MultiplayerCountdown newCountdown;
-
-            switch (room?.Countdown)
-            {
-                case MatchStartCountdown:
-                    newCountdown = room.Countdown;
-                    break;
-
-                // Clear the countdown with any other (including non-null) countdown values.
-                default:
-                    newCountdown = null;
-                    break;
-            }
+            MultiplayerCountdown newCountdown = room?.ActiveCountdowns.SingleOrDefault(c => c is MatchStartCountdown);
 
             if (newCountdown != countdown)
             {
-                countdown = room?.Countdown;
+                countdown = newCountdown;
                 countdownChangeTime = Time.Current;
             }
 
@@ -213,7 +201,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 case MultiplayerUserState.Spectating:
                 case MultiplayerUserState.Ready:
-                    if (room?.Host?.Equals(localUser) == true && room.Countdown == null)
+                    if (room?.Host?.Equals(localUser) == true && !room.ActiveCountdowns.Any(c => c is MatchStartCountdown))
                         setGreen();
                     else
                         setYellow();
@@ -248,8 +236,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             get
             {
-                if (room?.Countdown != null && multiplayerClient.IsHost && multiplayerClient.LocalUser?.State == MultiplayerUserState.Ready && !room.Settings.AutoStartEnabled)
+                if (room?.ActiveCountdowns.Any(c => c is MatchStartCountdown) == true
+                    && multiplayerClient.IsHost
+                    && multiplayerClient.LocalUser?.State == MultiplayerUserState.Ready
+                    && !room.Settings.AutoStartEnabled)
+                {
                     return "Cancel countdown";
+                }
 
                 return base.TooltipText;
             }

From b2f30fbf8cb7e76d02d8cb957d6a2eb1328f2b1e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 5 Sep 2022 20:13:23 +0900
Subject: [PATCH 131/709] Add countdown exclusivity

---
 osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs | 3 ++-
 osu.Game/Online/Multiplayer/MatchStartCountdown.cs         | 3 ++-
 osu.Game/Online/Multiplayer/MultiplayerCountdown.cs        | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
index 7f5c0f0a05..81ba56f35c 100644
--- a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
@@ -13,7 +13,8 @@ namespace osu.Game.Online.Multiplayer
     /// and forcing progression of any clients that are blocking load due to user interaction.
     /// </summary>
     [MessagePackObject]
-    public class ForceGameplayStartCountdown : MultiplayerCountdown
+    public sealed class ForceGameplayStartCountdown : MultiplayerCountdown
     {
+        public override bool IsExclusive => true;
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MatchStartCountdown.cs b/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
index 5d3365c947..b4c66e6f5b 100644
--- a/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
@@ -9,7 +9,8 @@ namespace osu.Game.Online.Multiplayer
     /// A <see cref="MultiplayerCountdown"/> which will start the match after ending.
     /// </summary>
     [MessagePackObject]
-    public class MatchStartCountdown : MultiplayerCountdown
+    public sealed class MatchStartCountdown : MultiplayerCountdown
     {
+        public override bool IsExclusive => true;
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
index 00bfa8919a..e8e2365f7b 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
@@ -29,5 +29,10 @@ namespace osu.Game.Online.Multiplayer
         /// </remarks>
         [Key(1)]
         public TimeSpan TimeRemaining { get; set; }
+
+        /// <summary>
+        /// Whether only a single instance of this <see cref="MultiplayerCountdown"/> type may be active at any one time.
+        /// </summary>
+        public virtual bool IsExclusive => false;
     }
 }

From e33486a766044c17c2f254f5e8df6d72b29c341e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Sep 2022 23:20:02 +0900
Subject: [PATCH 132/709] Implement `IAdjustableAudioComponent` in
 `MasterGameplayClockContainer`

---
 .../Play/MasterGameplayClockContainer.cs      | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 2f1ffa126f..57e67e6e26 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play
     /// <remarks>
     /// This is intended to be used as a single controller for gameplay, or as a reference source for other <see cref="GameplayClockContainer"/>s.
     /// </remarks>
-    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider
+    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider, IAdjustableAudioComponent
     {
         /// <summary>
         /// Duration before gameplay start time required before skip button displays.
@@ -41,6 +41,8 @@ namespace osu.Game.Screens.Play
 
         private readonly WorkingBeatmap beatmap;
 
+        private readonly Track track;
+
         private readonly double skipTargetTime;
 
         private readonly List<Bindable<double>> nonGameplayAdjustments = new List<Bindable<double>>();
@@ -66,6 +68,7 @@ namespace osu.Game.Screens.Play
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
             : base(beatmap.Track, true)
         {
+            track = beatmap.Track;
             this.beatmap = beatmap;
             this.skipTargetTime = skipTargetTime;
 
@@ -195,9 +198,6 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
-            if (SourceClock is not Track track)
-                return;
-
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -212,9 +212,6 @@ namespace osu.Game.Screens.Play
             if (!speedAdjustmentsApplied)
                 return;
 
-            if (SourceClock is not Track track)
-                return;
-
             track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -234,5 +231,29 @@ namespace osu.Game.Screens.Play
         IClock IBeatSyncProvider.Clock => this;
 
         ChannelAmplitudes IHasAmplitudes.CurrentAmplitudes => beatmap.TrackLoaded ? beatmap.Track.CurrentAmplitudes : ChannelAmplitudes.Empty;
+
+        void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
+            track.AddAdjustment(type, adjustBindable);
+
+        void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
+            track.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+        public BindableNumber<double> Volume => throw new NotImplementedException();
+        public BindableNumber<double> Balance => throw new NotImplementedException();
+        public BindableNumber<double> Frequency => throw new NotImplementedException();
+        public BindableNumber<double> Tempo => throw new NotImplementedException();
+
+        public IBindable<double> AggregateVolume => throw new NotImplementedException();
+        public IBindable<double> AggregateBalance => throw new NotImplementedException();
+        public IBindable<double> AggregateFrequency => throw new NotImplementedException();
+        public IBindable<double> AggregateTempo => throw new NotImplementedException();
     }
 }

From 7084aeee0523af04c380ef1ee2cee143d18f2fcc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Sep 2022 23:22:38 +0900
Subject: [PATCH 133/709] Add method flow to reset applied adjustments

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 4 +++-
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 7 +++++--
 osu.Game/Screens/Play/Player.cs                       | 9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6de88d7ad0..490c2329ca 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -196,7 +196,9 @@ namespace osu.Game.Screens.Play
 
         void IAdjustableClock.Reset() => Reset();
 
-        public void ResetSpeedAdjustments() => throw new NotImplementedException();
+        public virtual void ResetSpeedAdjustments()
+        {
+        }
 
         double IAdjustableClock.Rate
         {
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 57e67e6e26..15e9a40fd3 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -238,11 +238,14 @@ namespace osu.Game.Screens.Play
         void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
             track.RemoveAdjustment(type, adjustBindable);
 
-        public void RemoveAllAdjustments(AdjustableProperty type)
+        public override void ResetSpeedAdjustments()
         {
-            throw new NotImplementedException();
+            track.RemoveAllAdjustments(AdjustableProperty.Frequency);
+            track.RemoveAllAdjustments(AdjustableProperty.Tempo);
         }
 
+        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
+
         public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
         public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4afd04c335..21a02fbe0b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -999,9 +999,12 @@ namespace osu.Game.Screens.Play
             // Our mods are local copies of the global mods so they need to be re-applied to the track.
             // This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
             // Todo: In the future, player will receive in a track and will probably not have to worry about this...
-            musicController.ResetTrackAdjustments();
-            foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(musicController.CurrentTrack);
+            if (GameplayClockContainer is IAdjustableAudioComponent adjustableClock)
+            {
+                GameplayClockContainer.ResetSpeedAdjustments();
+                foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
+                    mod.ApplyToTrack(adjustableClock);
+            }
 
             updateGameplayState();
 

From 266eb758aa2471d1cdb54253ab564e02a27764a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Sep 2022 23:37:41 +0900
Subject: [PATCH 134/709] Use new flow to calcaulate `TrueGameplayRate`

---
 .../Screens/Play/GameplayClockContainer.cs    | 19 +---------
 .../Play/MasterGameplayClockContainer.cs      | 35 ++++++++++++-------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 490c2329ca..4d48675f94 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Timing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Play
@@ -225,22 +224,6 @@ namespace osu.Game.Screens.Play
 
         public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
 
-        public double TrueGameplayRate
-        {
-            get
-            {
-                double baseRate = Rate;
-
-                foreach (double adjustment in NonGameplayAdjustments)
-                {
-                    if (Precision.AlmostEquals(adjustment, 0))
-                        return 0;
-
-                    baseRate /= adjustment;
-                }
-
-                return baseRate;
-            }
-        }
+        public virtual double TrueGameplayRate => Rate;
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 15e9a40fd3..bda8718dc6 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -45,8 +45,6 @@ namespace osu.Game.Screens.Play
 
         private readonly double skipTargetTime;
 
-        private readonly List<Bindable<double>> nonGameplayAdjustments = new List<Bindable<double>>();
-
         /// <summary>
         /// Stores the time at which the last <see cref="StopGameplayClock"/> call was triggered.
         /// This is used to ensure we resume from that precise point in time, ignoring the proceeding frequency ramp.
@@ -58,8 +56,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private double? actualStopTime;
 
-        public override IEnumerable<double> NonGameplayAdjustments => nonGameplayAdjustments.Select(b => b.Value);
-
         /// <summary>
         /// Create a new master gameplay clock container.
         /// </summary>
@@ -201,9 +197,6 @@ namespace osu.Game.Screens.Play
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            nonGameplayAdjustments.Add(GameplayClock.ExternalPauseFrequencyAdjust);
-            nonGameplayAdjustments.Add(UserPlaybackRate);
-
             speedAdjustmentsApplied = true;
         }
 
@@ -215,9 +208,6 @@ namespace osu.Game.Screens.Play
             track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            nonGameplayAdjustments.Remove(GameplayClock.ExternalPauseFrequencyAdjust);
-            nonGameplayAdjustments.Remove(UserPlaybackRate);
-
             speedAdjustmentsApplied = false;
         }
 
@@ -232,11 +222,30 @@ namespace osu.Game.Screens.Play
 
         ChannelAmplitudes IHasAmplitudes.CurrentAmplitudes => beatmap.TrackLoaded ? beatmap.Track.CurrentAmplitudes : ChannelAmplitudes.Empty;
 
-        void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
-            track.AddAdjustment(type, adjustBindable);
+        private readonly List<IBindable<double>> speedAdjustments = new List<IBindable<double>>();
 
-        void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) =>
+        public override double TrueGameplayRate
+        {
+            get
+            {
+                double rate = Rate;
+                foreach (var a in speedAdjustments)
+                    rate *= a.Value;
+                return rate;
+            }
+        }
+
+        void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            speedAdjustments.Add(adjustBindable);
+            track.AddAdjustment(type, adjustBindable);
+        }
+
+        void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            speedAdjustments.Remove(adjustBindable);
             track.RemoveAdjustment(type, adjustBindable);
+        }
 
         public override void ResetSpeedAdjustments()
         {

From 44b456e216741a814bc61018aa08c2642465ea74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Sep 2022 23:38:22 +0900
Subject: [PATCH 135/709] Use gameplay clock's `TrueGameplayRate` in
 `FrameStabilityContainer`?

---
 .../Rulesets/UI/FrameStabilityContainer.cs     | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 18d0ff0bed..4d817cd973 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -263,23 +263,7 @@ namespace osu.Game.Rulesets.UI
 
         public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
 
-        public double TrueGameplayRate
-        {
-            get
-            {
-                double baseRate = Rate;
-
-                foreach (double adjustment in NonGameplayAdjustments)
-                {
-                    if (Precision.AlmostEquals(adjustment, 0))
-                        return 0;
-
-                    baseRate /= adjustment;
-                }
-
-                return baseRate;
-            }
-        }
+        public double TrueGameplayRate => parentGameplayClock?.TrueGameplayRate ?? Rate;
 
         public double StartTime => parentGameplayClock?.StartTime ?? 0;
 

From b109e5de6ce537916252487ccd183ef870012afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Tue, 6 Sep 2022 00:04:10 +0900
Subject: [PATCH 136/709] chore(osu.Game): align height of bars on timing
 distribution graph to `basalHeight` first and combine their transitions into
 each one

---
 .../Statistics/HitEventTimingDistributionGraph.cs   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 1be32a94af..5fbc07921a 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -278,9 +278,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 }
             }
 
-            private const double total_duration = 300;
-
-            private double duration => total_duration / Math.Max(values.Count, 1);
+            private const double duration = 300;
 
             private float offsetForValue(float value)
             {
@@ -296,19 +294,20 @@ namespace osu.Game.Screens.Ranking.Statistics
             {
                 base.LoadComplete();
 
+                foreach (var boxOriginal in boxOriginals)
+                    boxOriginal.Height = basalHeight;
+
                 float offsetValue = 0;
 
                 if (values.Any())
                 {
                     for (int i = 0; i < values.Count; i++)
                     {
-                        boxOriginals[i].Y = BoundingBox.Height * offsetForValue(offsetValue);
-                        boxOriginals[i].Delay(duration * i).ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
+                        boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
+                        boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
                         offsetValue -= values[i].Value;
                     }
                 }
-                else
-                    boxOriginals.Single().ResizeHeightTo(basalHeight, duration, Easing.OutQuint);
             }
 
             public void UpdateOffset(float adjustment)

From cfa1ebd0cb632cfba79e1c535952f282880ccc84 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Tue, 6 Sep 2022 03:00:13 +0200
Subject: [PATCH 137/709] Test fix

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 74387e1d8e..e3603ee90c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hitErrorMeter.Hide();
             });
 
-            AddRepeatStep("hit", () => newJudgement(), ColourHitErrorMeter.HitErrorShape. *2);
+            AddRepeatStep("hit", () => newJudgement(), 10);
 
             AddAssert("bars added", () => this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddAssert("circle added", () => this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());
@@ -164,7 +164,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("ensure max circles not exceeded", () =>
             {
                 return this.ChildrenOfType<ColourHitErrorMeter>()
-                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= ColourHitErrorMeter.HitShapeCount.Default);
+                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= 10);
             });
 
             AddStep("show displays", () =>

From bc1212f4e6785670a9249aaf1fa5ccf501fd6f5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Sep 2022 20:06:30 +0900
Subject: [PATCH 138/709] Change `NonGameplayAdjustments` to
 `GameplayAdjustments` and convert `TrueGameplayRate` to extension method

---
 .../Default/SpinnerRotationTracker.cs         |  2 +-
 .../NonVisual/GameplayClockContainerTest.cs   |  6 ++---
 .../Visual/Gameplay/TestScenePause.cs         |  2 +-
 .../Rulesets/UI/FrameStabilityContainer.cs    |  5 +----
 .../Screens/Play/GameplayClockContainer.cs    |  4 +---
 .../Screens/Play/GameplayClockExtensions.cs   | 22 +++++++++++++++++++
 osu.Game/Screens/Play/IGameplayClock.cs       |  8 +------
 .../Play/MasterGameplayClockContainer.cs      | 11 +---------
 8 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Screens/Play/GameplayClockExtensions.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index 554ea3ac90..97cebc3123 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             currentRotation += angle;
             // rate has to be applied each frame, because it's not guaranteed to be constant throughout playback
             // (see: ModTimeRamp)
-            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.TrueGameplayRate ?? Clock.Rate));
+            drawableSpinner.Result.RateAdjustedRotation += (float)(Math.Abs(angle) * (gameplayClock?.GetTrueGameplayRate() ?? Clock.Rate));
         }
 
         private void resetState(DrawableHitObject obj)
diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index f9f4ead644..95bf1ab354 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -13,17 +13,17 @@ namespace osu.Game.Tests.NonVisual
     {
         [TestCase(0)]
         [TestCase(1)]
-        public void TestTrueGameplayRateWithZeroAdjustment(double underlyingClockRate)
+        public void TestTrueGameplayRateWithGameplayAdjustment(double underlyingClockRate)
         {
             var framedClock = new FramedClock(new ManualClock { Rate = underlyingClockRate });
             var gameplayClock = new TestGameplayClockContainer(framedClock);
 
-            Assert.That(gameplayClock.TrueGameplayRate, Is.EqualTo(0));
+            Assert.That(gameplayClock.GetTrueGameplayRate(), Is.EqualTo(2));
         }
 
         private class TestGameplayClockContainer : GameplayClockContainer
         {
-            public override IEnumerable<double> NonGameplayAdjustments => new[] { 0.0 };
+            public override IEnumerable<double> GameplayAdjustments => new[] { 2.0 };
 
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
                 : base(underlyingClock)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index a6abdd7ee1..d0371acce7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -370,7 +370,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void confirmNoTrackAdjustments()
         {
-            AddAssert("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value == 1);
+            AddUntilStep("track has no adjustments", () => Beatmap.Value.Track.AggregateFrequency.Value, () => Is.EqualTo(1));
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4d817cd973..4f4a2d908d 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
-using osu.Framework.Utils;
 using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
 
@@ -263,11 +262,9 @@ namespace osu.Game.Rulesets.UI
 
         public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
 
-        public double TrueGameplayRate => parentGameplayClock?.TrueGameplayRate ?? Rate;
-
         public double StartTime => parentGameplayClock?.StartTime ?? 0;
 
-        public IEnumerable<double> NonGameplayAdjustments => parentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<double>();
+        public IEnumerable<double> GameplayAdjustments => parentGameplayClock?.GameplayAdjustments ?? Enumerable.Empty<double>();
 
         #endregion
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 4d48675f94..5dfaf2d584 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Play
         /// </remarks>
         public double StartTime { get; protected set; }
 
-        public virtual IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
+        public virtual IEnumerable<double> GameplayAdjustments => Enumerable.Empty<double>();
 
         private readonly BindableBool isPaused = new BindableBool(true);
 
@@ -223,7 +223,5 @@ namespace osu.Game.Screens.Play
         public double FramesPerSecond => GameplayClock.FramesPerSecond;
 
         public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
-
-        public virtual double TrueGameplayRate => Rate;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockExtensions.cs b/osu.Game/Screens/Play/GameplayClockExtensions.cs
new file mode 100644
index 0000000000..b683c61f63
--- /dev/null
+++ b/osu.Game/Screens/Play/GameplayClockExtensions.cs
@@ -0,0 +1,22 @@
+// 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;
+
+namespace osu.Game.Screens.Play
+{
+    public static class GameplayClockExtensions
+    {
+        /// <summary>
+        /// The rate of gameplay when playback is at 100%.
+        /// This excludes any seeking / user adjustments.
+        /// </summary>
+        public static double GetTrueGameplayRate(this IGameplayClock clock)
+        {
+            double rate = Math.Sign(clock.Rate);
+            foreach (double a in clock.GameplayAdjustments)
+                rate *= a;
+            return rate;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index ea567090ad..7c50b9d407 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -9,12 +9,6 @@ namespace osu.Game.Screens.Play
 {
     public interface IGameplayClock : IFrameBasedClock
     {
-        /// <summary>
-        /// The rate of gameplay when playback is at 100%.
-        /// This excludes any seeking / user adjustments.
-        /// </summary>
-        double TrueGameplayRate { get; }
-
         /// <summary>
         /// The time from which the clock should start. Will be seeked to on calling <see cref="GameplayClockContainer.Reset"/>.
         /// </summary>
@@ -27,7 +21,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// All adjustments applied to this clock which don't come from gameplay or mods.
         /// </summary>
-        IEnumerable<double> NonGameplayAdjustments { get; }
+        IEnumerable<double> GameplayAdjustments { get; }
 
         IBindable<bool> IsPaused { get; }
     }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index bda8718dc6..f1ee65dcd3 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -224,16 +224,7 @@ namespace osu.Game.Screens.Play
 
         private readonly List<IBindable<double>> speedAdjustments = new List<IBindable<double>>();
 
-        public override double TrueGameplayRate
-        {
-            get
-            {
-                double rate = Rate;
-                foreach (var a in speedAdjustments)
-                    rate *= a.Value;
-                return rate;
-            }
-        }
+        public override IEnumerable<double> GameplayAdjustments => speedAdjustments.Select(bindable => bindable.Value);
 
         void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
         {

From 66c44f5913d24c95116d1a4605ed4f6e3d3522d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Sep 2022 21:40:04 +0900
Subject: [PATCH 139/709] Delegate interface to valid target

---
 .../Play/MasterGameplayClockContainer.cs      | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index f1ee65dcd3..7c30f86125 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -8,6 +8,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -56,6 +57,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private double? actualStopTime;
 
+        /// <summary>
+        /// Maintained solely to delegate <see cref="IAdjustableAudioComponent"/> pieces to (to maintain parent lookups).
+        /// </summary>
+        private readonly AudioContainer audioContainer;
+
         /// <summary>
         /// Create a new master gameplay clock container.
         /// </summary>
@@ -69,6 +75,8 @@ namespace osu.Game.Screens.Play
             this.skipTargetTime = skipTargetTime;
 
             StartTime = findEarliestStartTime();
+
+            AddInternal(audioContainer = new AudioContainer());
         }
 
         private double findEarliestStartTime()
@@ -238,25 +246,32 @@ namespace osu.Game.Screens.Play
             track.RemoveAdjustment(type, adjustBindable);
         }
 
+        void IAdjustableAudioComponent.RemoveAllAdjustments(AdjustableProperty type) => audioContainer.RemoveAllAdjustments(type);
+
+        void IAdjustableAudioComponent.BindAdjustments(IAggregateAudioAdjustment component) => audioContainer.BindAdjustments(component);
+
+        void IAdjustableAudioComponent.UnbindAdjustments(IAggregateAudioAdjustment component) => audioContainer.UnbindAdjustments(component);
+
+        BindableNumber<double> IAdjustableAudioComponent.Volume => audioContainer.Volume;
+
+        BindableNumber<double> IAdjustableAudioComponent.Balance => audioContainer.Balance;
+
+        BindableNumber<double> IAdjustableAudioComponent.Frequency => audioContainer.Frequency;
+
+        BindableNumber<double> IAdjustableAudioComponent.Tempo => audioContainer.Tempo;
+
         public override void ResetSpeedAdjustments()
         {
             track.RemoveAllAdjustments(AdjustableProperty.Frequency);
             track.RemoveAllAdjustments(AdjustableProperty.Tempo);
         }
 
-        public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
+        IBindable<double> IAggregateAudioAdjustment.AggregateVolume => audioContainer.AggregateVolume;
 
-        public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
-        public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+        IBindable<double> IAggregateAudioAdjustment.AggregateBalance => audioContainer.AggregateBalance;
 
-        public BindableNumber<double> Volume => throw new NotImplementedException();
-        public BindableNumber<double> Balance => throw new NotImplementedException();
-        public BindableNumber<double> Frequency => throw new NotImplementedException();
-        public BindableNumber<double> Tempo => throw new NotImplementedException();
+        IBindable<double> IAggregateAudioAdjustment.AggregateFrequency => audioContainer.AggregateFrequency;
 
-        public IBindable<double> AggregateVolume => throw new NotImplementedException();
-        public IBindable<double> AggregateBalance => throw new NotImplementedException();
-        public IBindable<double> AggregateFrequency => throw new NotImplementedException();
-        public IBindable<double> AggregateTempo => throw new NotImplementedException();
+        IBindable<double> IAggregateAudioAdjustment.AggregateTempo => audioContainer.AggregateTempo;
     }
 }

From b5779508d06bc3455d61a0ef617a35b8f5d8c826 Mon Sep 17 00:00:00 2001
From: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date: Tue, 6 Sep 2022 17:10:32 +0100
Subject: [PATCH 140/709] Retrieve great hit window from the hit object

---
 .../Difficulty/Evaluators/RhythmEvaluator.cs      |  4 ++--
 .../Difficulty/Evaluators/SpeedEvaluator.cs       |  7 +++----
 .../Difficulty/OsuDifficultyCalculator.cs         | 13 ++++++-------
 .../Preprocessing/OsuDifficultyHitObject.cs       | 15 +++++++++++++++
 osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs  |  8 +++-----
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index 3ffd45b588..ca57c87af9 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <summary>
         /// Calculates a rhythm multiplier for the difficulty of the tap associated with historic data of the current <see cref="OsuDifficultyHitObject"/>.
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double lastDelta = lastObj.StrainTime;
                 double currRatio = 1.0 + 6.0 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
 
-                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - greatWindow * 0.6) / (greatWindow * 0.6));
+                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.6) / (currObj.HitWindowGreat * 0.6));
 
                 windowPenalty = Math.Min(1, windowPenalty);
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
index 5187717639..c98f875eb5 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/SpeedEvaluator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
         /// <item><description>and how easily they can be cheesed.</description></item>
         /// </list>
         /// </summary>
-        public static double EvaluateDifficultyOf(DifficultyHitObject current, double greatWindow)
+        public static double EvaluateDifficultyOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
                 return 0;
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
             var osuNextObj = (OsuDifficultyHitObject)current.Next(0);
 
             double strainTime = osuCurrObj.StrainTime;
-            double greatWindowFull = greatWindow * 2;
             double doubletapness = 1;
 
             // Nerf doubletappable doubles.
@@ -45,13 +44,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double nextDeltaTime = Math.Max(1, osuNextObj.DeltaTime);
                 double deltaDifference = Math.Abs(nextDeltaTime - currDeltaTime);
                 double speedRatio = currDeltaTime / Math.Max(currDeltaTime, deltaDifference);
-                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / greatWindowFull), 2);
+                double windowRatio = Math.Pow(Math.Min(1, currDeltaTime / osuCurrObj.HitWindowGreat), 2);
                 doubletapness = Math.Pow(speedRatio, 1 - windowRatio);
             }
 
             // Cap deltatime to the OD 300 hitwindow.
             // 0.93 is derived from making sure 260bpm OD8 streams aren't nerfed harshly, whilst 0.92 limits the effect of the cap.
-            strainTime /= Math.Clamp((strainTime / greatWindowFull) / 0.93, 0.92, 1);
+            strainTime /= Math.Clamp((strainTime / osuCurrObj.HitWindowGreat) / 0.93, 0.92, 1);
 
             // derive speedBonus for calculation
             double speedBonus = 1.0;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 6ef17d47c0..33787da8f6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty
     public class OsuDifficultyCalculator : DifficultyCalculator
     {
         private const double difficulty_multiplier = 0.0675;
-        private double hitWindowGreat;
 
         public override int Version => 20220902;
 
@@ -76,6 +75,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             int sliderCount = beatmap.HitObjects.Count(h => h is Slider);
             int spinnerCount = beatmap.HitObjects.Count(h => h is Spinner);
 
+            HitWindows hitWindows = new OsuHitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            double hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
+
             return new OsuDifficultyAttributes
             {
                 StarRating = starRating,
@@ -112,16 +116,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            HitWindows hitWindows = new OsuHitWindows();
-            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
-
-            hitWindowGreat = hitWindows.WindowFor(HitResult.Great) / clockRate;
-
             return new Skill[]
             {
                 new Aim(mods, true),
                 new Aim(mods, false),
-                new Speed(mods, hitWindowGreat),
+                new Speed(mods),
                 new Flashlight(mods)
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index c7c5650184..6aea00fd35 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
@@ -78,6 +79,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public double? Angle { get; private set; }
 
+        /// <summary>
+        /// Retrieves the full hit window for a Great <see cref="HitResult"/>.
+        /// </summary>
+        public double HitWindowGreat { get; private set; }
+
         private readonly OsuHitObject lastLastObject;
         private readonly OsuHitObject lastObject;
 
@@ -90,6 +96,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             // Capped to 25ms to prevent difficulty calculation breaking from simultaneous objects.
             StrainTime = Math.Max(DeltaTime, min_delta_time);
 
+            if (BaseObject is Slider sliderObject)
+            {
+                HitWindowGreat = 2 * sliderObject.HeadCircle.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+            else
+            {
+                HitWindowGreat = 2 * BaseObject.HitWindows.WindowFor(HitResult.Great) / clockRate;
+            }
+
             setDistances(clockRate);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index c39d61020c..efe0e136bf 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -26,14 +26,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
 
         protected override int ReducedSectionCount => 5;
         protected override double DifficultyMultiplier => 1.04;
-        private readonly double greatWindow;
 
         private readonly List<double> objectStrains = new List<double>();
 
-        public Speed(Mod[] mods, double hitWindowGreat)
+        public Speed(Mod[] mods)
             : base(mods)
         {
-            greatWindow = hitWindowGreat;
         }
 
         private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000);
@@ -43,9 +41,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         protected override double StrainValueAt(DifficultyHitObject current)
         {
             currentStrain *= strainDecay(((OsuDifficultyHitObject)current).StrainTime);
-            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current, greatWindow) * skillMultiplier;
+            currentStrain += SpeedEvaluator.EvaluateDifficultyOf(current) * skillMultiplier;
 
-            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current, greatWindow);
+            currentRhythm = RhythmEvaluator.EvaluateDifficultyOf(current);
 
             double totalStrain = currentStrain * currentRhythm;
 

From 3003fc1061f63b147a7e9bf0bc7eb03d0a42e7fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Wed, 7 Sep 2022 02:29:15 +0900
Subject: [PATCH 141/709] refactor(osu.Game): improve code quality

---
 .../TestSceneHitEventTimingDistributionGraph.cs       |  6 +++---
 .../Statistics/HitEventTimingDistributionGraph.cs     | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index fe4aba1317..4825cb7f80 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             createTest(CreateDistributedHitEvents(0, 50).Select(h =>
             {
-                var offset = Math.Abs(h.TimeOffset);
+                double offset = Math.Abs(h.TimeOffset);
                 var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             }).ToList());
@@ -73,13 +73,13 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             var wide = CreateDistributedHitEvents(0, 50).Select(h =>
             {
-                var offset = Math.Abs(h.TimeOffset);
+                double offset = Math.Abs(h.TimeOffset);
                 var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             });
             var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
             {
-                var offset = Math.Abs(h.TimeOffset);
+                double offset = Math.Abs(h.TimeOffset);
                 var result = offset > 25 ? HitResult.Miss : offset > 20 ? HitResult.Meh : offset > 15 ? HitResult.Ok : offset > 10 ? HitResult.Good : offset > 5 ? HitResult.Great : HitResult.Perfect;
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             });
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 5fbc07921a..d3c2716f8b 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -299,14 +299,11 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                 float offsetValue = 0;
 
-                if (values.Any())
+                for (int i = 0; i < values.Count; i++)
                 {
-                    for (int i = 0; i < values.Count; i++)
-                    {
-                        boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
-                        boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
-                        offsetValue -= values[i].Value;
-                    }
+                    boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
+                    boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
+                    offsetValue -= values[i].Value;
                 }
             }
 

From cb1bb99208d24c7d15f6adb64e289f87ae0116b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 16:43:48 +0900
Subject: [PATCH 142/709] Tidy up test logic

---
 ...estSceneHitEventTimingDistributionGraph.cs | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 4825cb7f80..198be4035b 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,7 +18,7 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneHitEventTimingDistributionGraph : OsuTestScene
     {
-        private HitEventTimingDistributionGraph graph;
+        private HitEventTimingDistributionGraph graph = null!;
 
         private static readonly HitObject placeholder_object = new HitCircle();
 
@@ -63,7 +61,12 @@ namespace osu.Game.Tests.Visual.Ranking
             createTest(CreateDistributedHitEvents(0, 50).Select(h =>
             {
                 double offset = Math.Abs(h.TimeOffset);
-                var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
+                HitResult result = offset > 36 ? HitResult.Miss
+                    : offset > 32 ? HitResult.Meh
+                    : offset > 24 ? HitResult.Ok
+                    : offset > 16 ? HitResult.Good
+                    : offset > 8 ? HitResult.Great
+                    : HitResult.Perfect;
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             }).ToList());
         }
@@ -74,13 +77,24 @@ namespace osu.Game.Tests.Visual.Ranking
             var wide = CreateDistributedHitEvents(0, 50).Select(h =>
             {
                 double offset = Math.Abs(h.TimeOffset);
-                var result = offset > 36 ? HitResult.Miss : offset > 32 ? HitResult.Meh : offset > 24 ? HitResult.Ok : offset > 16 ? HitResult.Good : offset > 8 ? HitResult.Great : HitResult.Perfect;
+                HitResult result = offset > 36 ? HitResult.Miss
+                    : offset > 32 ? HitResult.Meh
+                    : offset > 24 ? HitResult.Ok
+                    : offset > 16 ? HitResult.Good
+                    : offset > 8 ? HitResult.Great
+                    : HitResult.Perfect;
+
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             });
             var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
             {
                 double offset = Math.Abs(h.TimeOffset);
-                var result = offset > 25 ? HitResult.Miss : offset > 20 ? HitResult.Meh : offset > 15 ? HitResult.Ok : offset > 10 ? HitResult.Good : offset > 5 ? HitResult.Great : HitResult.Perfect;
+                HitResult result = offset > 25 ? HitResult.Miss
+                    : offset > 20 ? HitResult.Meh
+                    : offset > 15 ? HitResult.Ok
+                    : offset > 10 ? HitResult.Good
+                    : offset > 5 ? HitResult.Great
+                    : HitResult.Perfect;
                 return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null);
             });
             createTest(wide.Concat(narrow).ToList());

From 99ef0c95fec70b164c745f589fc8940726faf454 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 16:51:51 +0900
Subject: [PATCH 143/709] Simplify children assignment

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index d3c2716f8b..37765fe962 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                 if (values.Any())
                 {
-                    boxOriginals = values.Select((v, i) => new Circle
+                    InternalChildren = boxOriginals = values.Select((v, i) => new Circle
                     {
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
@@ -260,7 +260,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Colour = isCentre && i == 0 ? Color4.White : v.Colour,
                         Height = 0,
                     }).ToArray();
-                    InternalChildren = boxOriginals.Reverse().ToArray();
                 }
                 else
                 {

From 75d0deef72ab44b075345f6f4aeddde4d1a52492 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 17:38:00 +0900
Subject: [PATCH 144/709] Apply proposed changes to remove inheritance from
 `MasterGameplayClockContainer`

---
 .../NonVisual/GameplayClockContainerTest.cs   |  6 +-
 .../Rulesets/UI/FrameStabilityContainer.cs    |  7 ++-
 .../Screens/Play/GameplayClockContainer.cs    |  5 +-
 .../Screens/Play/GameplayClockExtensions.cs   |  8 ++-
 osu.Game/Screens/Play/IGameplayClock.cs       |  6 +-
 .../Play/MasterGameplayClockContainer.cs      | 57 +------------------
 osu.Game/Screens/Play/Player.cs               |  7 ++-
 7 files changed, 24 insertions(+), 72 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 95bf1ab354..80f0aaeb55 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -1,8 +1,9 @@
 // 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.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -23,11 +24,10 @@ namespace osu.Game.Tests.NonVisual
 
         private class TestGameplayClockContainer : GameplayClockContainer
         {
-            public override IEnumerable<double> GameplayAdjustments => new[] { 2.0 };
-
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
                 : base(underlyingClock)
             {
+                GameplayAdjustments.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
             }
         }
     }
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 4f4a2d908d..f0c7a398eb 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -2,10 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -264,7 +263,9 @@ namespace osu.Game.Rulesets.UI
 
         public double StartTime => parentGameplayClock?.StartTime ?? 0;
 
-        public IEnumerable<double> GameplayAdjustments => parentGameplayClock?.GameplayAdjustments ?? Enumerable.Empty<double>();
+        private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();
+
+        public IAdjustableAudioComponent GameplayAdjustments => parentGameplayClock?.GameplayAdjustments ?? gameplayAdjustments;
 
         #endregion
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 5dfaf2d584..e64c628fa0 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -2,9 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -45,7 +44,7 @@ namespace osu.Game.Screens.Play
         /// </remarks>
         public double StartTime { get; protected set; }
 
-        public virtual IEnumerable<double> GameplayAdjustments => Enumerable.Empty<double>();
+        public IAdjustableAudioComponent GameplayAdjustments { get; } = new AudioAdjustments();
 
         private readonly BindableBool isPaused = new BindableBool(true);
 
diff --git a/osu.Game/Screens/Play/GameplayClockExtensions.cs b/osu.Game/Screens/Play/GameplayClockExtensions.cs
index b683c61f63..3cc12f7afe 100644
--- a/osu.Game/Screens/Play/GameplayClockExtensions.cs
+++ b/osu.Game/Screens/Play/GameplayClockExtensions.cs
@@ -13,10 +13,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public static double GetTrueGameplayRate(this IGameplayClock clock)
         {
+            // To handle rewind, we still want to maintain the same direction as the underlying clock.
             double rate = Math.Sign(clock.Rate);
-            foreach (double a in clock.GameplayAdjustments)
-                rate *= a;
-            return rate;
+
+            return rate
+                   * clock.GameplayAdjustments.AggregateFrequency.Value
+                   * clock.GameplayAdjustments.AggregateTempo.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index 7c50b9d407..c58d2dbcac 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -1,7 +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.Collections.Generic;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
@@ -19,9 +19,9 @@ namespace osu.Game.Screens.Play
         double StartTime { get; }
 
         /// <summary>
-        /// All adjustments applied to this clock which don't come from gameplay or mods.
+        /// All adjustments applied to this clock which come from gameplay or mods.
         /// </summary>
-        IEnumerable<double> GameplayAdjustments { get; }
+        IAdjustableAudioComponent GameplayAdjustments { get; }
 
         IBindable<bool> IsPaused { get; }
     }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 7c30f86125..226ce8b0d8 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -2,13 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -25,7 +23,7 @@ namespace osu.Game.Screens.Play
     /// <remarks>
     /// This is intended to be used as a single controller for gameplay, or as a reference source for other <see cref="GameplayClockContainer"/>s.
     /// </remarks>
-    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider, IAdjustableAudioComponent
+    public class MasterGameplayClockContainer : GameplayClockContainer, IBeatSyncProvider
     {
         /// <summary>
         /// Duration before gameplay start time required before skip button displays.
@@ -57,11 +55,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private double? actualStopTime;
 
-        /// <summary>
-        /// Maintained solely to delegate <see cref="IAdjustableAudioComponent"/> pieces to (to maintain parent lookups).
-        /// </summary>
-        private readonly AudioContainer audioContainer;
-
         /// <summary>
         /// Create a new master gameplay clock container.
         /// </summary>
@@ -75,8 +68,6 @@ namespace osu.Game.Screens.Play
             this.skipTargetTime = skipTargetTime;
 
             StartTime = findEarliestStartTime();
-
-            AddInternal(audioContainer = new AudioContainer());
         }
 
         private double findEarliestStartTime()
@@ -202,6 +193,7 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
+            track.BindAdjustments(GameplayAdjustments);
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -213,6 +205,7 @@ namespace osu.Game.Screens.Play
             if (!speedAdjustmentsApplied)
                 return;
 
+            track.UnbindAdjustments(GameplayAdjustments);
             track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -229,49 +222,5 @@ namespace osu.Game.Screens.Play
         IClock IBeatSyncProvider.Clock => this;
 
         ChannelAmplitudes IHasAmplitudes.CurrentAmplitudes => beatmap.TrackLoaded ? beatmap.Track.CurrentAmplitudes : ChannelAmplitudes.Empty;
-
-        private readonly List<IBindable<double>> speedAdjustments = new List<IBindable<double>>();
-
-        public override IEnumerable<double> GameplayAdjustments => speedAdjustments.Select(bindable => bindable.Value);
-
-        void IAdjustableAudioComponent.AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            speedAdjustments.Add(adjustBindable);
-            track.AddAdjustment(type, adjustBindable);
-        }
-
-        void IAdjustableAudioComponent.RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            speedAdjustments.Remove(adjustBindable);
-            track.RemoveAdjustment(type, adjustBindable);
-        }
-
-        void IAdjustableAudioComponent.RemoveAllAdjustments(AdjustableProperty type) => audioContainer.RemoveAllAdjustments(type);
-
-        void IAdjustableAudioComponent.BindAdjustments(IAggregateAudioAdjustment component) => audioContainer.BindAdjustments(component);
-
-        void IAdjustableAudioComponent.UnbindAdjustments(IAggregateAudioAdjustment component) => audioContainer.UnbindAdjustments(component);
-
-        BindableNumber<double> IAdjustableAudioComponent.Volume => audioContainer.Volume;
-
-        BindableNumber<double> IAdjustableAudioComponent.Balance => audioContainer.Balance;
-
-        BindableNumber<double> IAdjustableAudioComponent.Frequency => audioContainer.Frequency;
-
-        BindableNumber<double> IAdjustableAudioComponent.Tempo => audioContainer.Tempo;
-
-        public override void ResetSpeedAdjustments()
-        {
-            track.RemoveAllAdjustments(AdjustableProperty.Frequency);
-            track.RemoveAllAdjustments(AdjustableProperty.Tempo);
-        }
-
-        IBindable<double> IAggregateAudioAdjustment.AggregateVolume => audioContainer.AggregateVolume;
-
-        IBindable<double> IAggregateAudioAdjustment.AggregateBalance => audioContainer.AggregateBalance;
-
-        IBindable<double> IAggregateAudioAdjustment.AggregateFrequency => audioContainer.AggregateFrequency;
-
-        IBindable<double> IAggregateAudioAdjustment.AggregateTempo => audioContainer.AggregateTempo;
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 21a02fbe0b..17cae05862 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -999,11 +999,12 @@ namespace osu.Game.Screens.Play
             // Our mods are local copies of the global mods so they need to be re-applied to the track.
             // This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
             // Todo: In the future, player will receive in a track and will probably not have to worry about this...
-            if (GameplayClockContainer is IAdjustableAudioComponent adjustableClock)
+            if (GameplayClockContainer is MasterGameplayClockContainer masterClock)
             {
-                GameplayClockContainer.ResetSpeedAdjustments();
+                musicController.ResetTrackAdjustments();
+
                 foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
-                    mod.ApplyToTrack(adjustableClock);
+                    mod.ApplyToTrack(masterClock.GameplayAdjustments);
             }
 
             updateGameplayState();

From fa15502384f86d6a323cf999eb6692497beb8a7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 19:12:16 +0900
Subject: [PATCH 145/709] Move full track adjustment flow inside
 `MasterGameplayClockContainer`

---
 .../Screens/Play/MasterGameplayClockContainer.cs     |  7 +++++++
 osu.Game/Screens/Play/Player.cs                      | 12 ++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 226ce8b0d8..26fb127e83 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Play
 {
@@ -55,6 +57,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private double? actualStopTime;
 
+        [Resolved]
+        private MusicController musicController { get; set; } = null!;
+
         /// <summary>
         /// Create a new master gameplay clock container.
         /// </summary>
@@ -193,6 +198,8 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
+            musicController.ResetTrackAdjustments();
+
             track.BindAdjustments(GameplayAdjustments);
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 17cae05862..e93502da13 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -996,16 +996,8 @@ namespace osu.Game.Screens.Play
             foreach (var mod in GameplayState.Mods.OfType<IApplicableToHUD>())
                 mod.ApplyToHUD(HUDOverlay);
 
-            // Our mods are local copies of the global mods so they need to be re-applied to the track.
-            // This is done through the music controller (for now), because resetting speed adjustments on the beatmap track also removes adjustments provided by DrawableTrack.
-            // Todo: In the future, player will receive in a track and will probably not have to worry about this...
-            if (GameplayClockContainer is MasterGameplayClockContainer masterClock)
-            {
-                musicController.ResetTrackAdjustments();
-
-                foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
-                    mod.ApplyToTrack(masterClock.GameplayAdjustments);
-            }
+            foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(GameplayClockContainer.GameplayAdjustments);
 
             updateGameplayState();
 

From 1be3b74ff33367af48d34c7e42fb0bd7b530c94c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 19:12:34 +0900
Subject: [PATCH 146/709] Fix multiplayer spectator not getting gameplay
 adjustments applied

---
 .../Spectate/MultiSpectatorPlayer.cs          | 11 ++++++++++-
 .../Spectate/MultiSpectatorScreen.cs          | 19 +++++++++++++++++++
 .../Spectate/SpectatorPlayerClock.cs          |  3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index d351d121c6..7e910b7946 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -53,6 +53,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new GameplayClockContainer(spectatorPlayerClock);
+        {
+            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
+
+            // Directionality is important, as BindAdjustments is... not actually a bidirectional bind...
+            // We want to ensure that any adjustments applied by the Player instance are applied to the SpectatorPlayerClock
+            // so they can be consumed by the spectator screen (and applied to the master clock / track).
+            spectatorPlayerClock.GameplayAdjustments.BindAdjustments(gameplayClockContainer.GameplayAdjustments);
+
+            return gameplayClockContainer;
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index c2ece90472..b7c07372dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -43,6 +44,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private MultiplayerClient multiplayerClient { get; set; } = null!;
 
+        private AudioAdjustments? boundAdjustments;
+
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer = null!;
         private SpectatorSyncManager syncManager = null!;
@@ -157,6 +160,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             base.LoadComplete();
 
             masterClockContainer.Reset();
+
+            // Start with adjustments from the first player to keep a sane state.
+            bindAudioAdjustments(instances.First());
         }
 
         protected override void Update()
@@ -169,11 +175,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                                               .OrderBy(i => Math.Abs(i.SpectatorPlayerClock.CurrentTime - syncManager.CurrentMasterTime))
                                               .FirstOrDefault();
 
+                // Only bind adjustments if there's actually a valid source, else just use the previous ones to ensure no sudden changes to audio.
+                if (currentAudioSource != null)
+                    bindAudioAdjustments(currentAudioSource);
+
                 foreach (var instance in instances)
                     instance.Mute = instance != currentAudioSource;
             }
         }
 
+        private void bindAudioAdjustments(PlayerArea first)
+        {
+            if (boundAdjustments != null)
+                masterClockContainer.GameplayAdjustments.UnbindAdjustments(boundAdjustments);
+
+            boundAdjustments = first.SpectatorPlayerClock.GameplayAdjustments;
+            masterClockContainer.GameplayAdjustments.BindAdjustments(boundAdjustments);
+        }
+
         private bool isCandidateAudioSource(SpectatorPlayerClock? clock)
             => clock?.IsRunning == true && !clock.IsCatchingUp && !clock.WaitingOnFrames;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
index 45615d4e19..5667be1f4b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Audio;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -19,6 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly GameplayClockContainer masterClock;
 
+        public readonly AudioAdjustments GameplayAdjustments = new AudioAdjustments();
+
         public double CurrentTime { get; private set; }
 
         /// <summary>

From e6b449fe0b602a76a7d61efb5bff0a609fb241cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 19:23:44 +0900
Subject: [PATCH 147/709] Fix case of zero rate calculating a zero true
 gameplay rate

---
 osu.Game/Screens/Play/GameplayClockExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockExtensions.cs b/osu.Game/Screens/Play/GameplayClockExtensions.cs
index 3cc12f7afe..ec77a94ce9 100644
--- a/osu.Game/Screens/Play/GameplayClockExtensions.cs
+++ b/osu.Game/Screens/Play/GameplayClockExtensions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play
         public static double GetTrueGameplayRate(this IGameplayClock clock)
         {
             // To handle rewind, we still want to maintain the same direction as the underlying clock.
-            double rate = Math.Sign(clock.Rate);
+            double rate = clock.Rate == 0 ? 1 : Math.Sign(clock.Rate);
 
             return rate
                    * clock.GameplayAdjustments.AggregateFrequency.Value

From cb9bae1f5c87ac68fa621a7652db9a9e3dea11df Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Sep 2022 19:05:53 +0900
Subject: [PATCH 148/709] Enable NRT

---
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 56 +++++++++----------
 .../Playlists/PlaylistsSongSelect.cs          |  2 -
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 3d6127e8e7..c2dafda592 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -1,12 +1,10 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using JetBrains.Annotations;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -15,6 +13,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -30,12 +29,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchSettingsOverlay : RoomSettingsOverlay
     {
-        private MatchSettings settings;
+        private MatchSettings settings = null!;
 
         protected override OsuButton SubmitButton => settings.ApplyButton;
 
         [Resolved]
-        private OngoingOperationTracker ongoingOperationTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; } = null!;
 
         protected override bool IsLoading => ongoingOperationTracker.InProgress.Value;
 
@@ -57,20 +56,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             private const float disabled_alpha = 0.2f;
 
-            public Action SettingsApplied;
+            public Action? SettingsApplied;
 
-            public OsuTextBox NameField, MaxParticipantsField;
-            public MatchTypePicker TypePicker;
-            public OsuEnumDropdown<QueueMode> QueueModeDropdown;
-            public OsuTextBox PasswordTextBox;
-            public OsuCheckbox AutoSkipCheckbox;
-            public TriangleButton ApplyButton;
+            public OsuTextBox NameField = null!;
+            public OsuTextBox MaxParticipantsField = null!;
+            public MatchTypePicker TypePicker = null!;
+            public OsuEnumDropdown<QueueMode> QueueModeDropdown = null!;
+            public OsuTextBox PasswordTextBox = null!;
+            public OsuCheckbox AutoSkipCheckbox = null!;
+            public TriangleButton ApplyButton = null!;
 
-            public OsuSpriteText ErrorText;
+            public OsuSpriteText ErrorText = null!;
 
-            private OsuEnumDropdown<StartMode> startModeDropdown;
-            private OsuSpriteText typeLabel;
-            private LoadingLayer loadingLayer;
+            private OsuEnumDropdown<StartMode> startModeDropdown = null!;
+            private OsuSpriteText typeLabel = null!;
+            private LoadingLayer loadingLayer = null!;
+
+            [Resolved]
+            private BeatmapManager beatmapManager { get; set; } = null!;
 
             public void SelectBeatmap()
             {
@@ -79,26 +82,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }
 
             [Resolved]
-            private MultiplayerMatchSubScreen matchSubScreen { get; set; }
+            private MultiplayerMatchSubScreen matchSubScreen { get; set; } = null!;
 
             [Resolved]
-            private IRoomManager manager { get; set; }
+            private IRoomManager manager { get; set; } = null!;
 
             [Resolved]
-            private MultiplayerClient client { get; set; }
+            private MultiplayerClient client { get; set; } = null!;
 
             [Resolved]
-            private OngoingOperationTracker ongoingOperationTracker { get; set; }
+            private OngoingOperationTracker ongoingOperationTracker { get; set; } = null!;
 
             private readonly IBindable<bool> operationInProgress = new BindableBool();
-
-            [CanBeNull]
-            private IDisposable applyingSettingsOperation;
-
             private readonly Room room;
 
-            private Drawable playlistContainer;
-            private DrawableRoomPlaylist drawablePlaylist;
+            private IDisposable? applyingSettingsOperation;
+            private Drawable playlistContainer = null!;
+            private DrawableRoomPlaylist drawablePlaylist = null!;
 
             public MatchSettings(Room room)
             {
@@ -423,7 +423,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     else
                         room.MaxParticipants.Value = null;
 
-                    manager?.CreateRoom(room, onSuccess, onError);
+                    manager.CreateRoom(room, onSuccess, onError);
                 }
             }
 
@@ -466,7 +466,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
-            private Bindable<long?> roomId { get; set; }
+            private Bindable<long?> roomId { get; set; } = null!;
 
             protected override void LoadComplete()
             {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 73765fc661..e3f7b5dfc4 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Screens;
 using osu.Game.Online.API;

From 770c1ade2fee41abc436f38dc24685c5c8560a25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 20:00:24 +0900
Subject: [PATCH 149/709] Add test coverage of track rate adjusting during
 multi spectator

---
 .../TestSceneMultiSpectatorScreen.cs          | 21 ++++++++++++++++---
 .../Multiplayer/TestMultiplayerClient.cs      |  7 ++++---
 .../Visual/Spectator/TestSpectatorClient.cs   |  8 ++++++-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a11a67aebd..70f498e7f2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -13,9 +13,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play;
@@ -332,6 +334,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("player 2 playing from correct point in time", () => getPlayer(PLAYER_2_ID).ChildrenOfType<DrawableRuleset>().Single().FrameStableClock.CurrentTime > 30000);
         }
 
+        [Test]
+        public void TestGameplayRateAdjust()
+        {
+            start(getPlayerIds(4), mods: new[] { new APIMod(new OsuModDoubleTime()) });
+
+            loadSpectateScreen();
+
+            sendFrames(getPlayerIds(4), 300);
+
+            AddUntilStep("wait for correct track speed", () => Beatmap.Value.Track.Rate, () => Is.EqualTo(1.5));
+        }
+
         [Test]
         public void TestPlayersLeaveWhileSpectating()
         {
@@ -420,7 +434,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
 
-        private void start(int[] userIds, int? beatmapId = null)
+        private void start(int[] userIds, int? beatmapId = null, APIMod[]? mods = null)
         {
             AddStep("start play", () =>
             {
@@ -429,10 +443,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     var user = new MultiplayerRoomUser(id)
                     {
                         User = new APIUser { Id = id },
+                        Mods = mods ?? Array.Empty<APIMod>(),
                     };
 
-                    OnlinePlayDependencies.MultiplayerClient.AddUser(user.User, true);
-                    SpectatorClient.SendStartPlay(id, beatmapId ?? importedBeatmapId);
+                    OnlinePlayDependencies.MultiplayerClient.AddUser(user, true);
+                    SpectatorClient.SendStartPlay(id, beatmapId ?? importedBeatmapId, mods);
 
                     playingUsers.Add(user);
                 }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 19b887eea5..84737bce3f 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -81,13 +81,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void Disconnect() => isConnected.Value = false;
 
         public MultiplayerRoomUser AddUser(APIUser user, bool markAsPlaying = false)
-        {
-            var roomUser = new MultiplayerRoomUser(user.Id) { User = user };
+            => AddUser(new MultiplayerRoomUser(user.Id) { User = user }, markAsPlaying);
 
+        public MultiplayerRoomUser AddUser(MultiplayerRoomUser roomUser, bool markAsPlaying = false)
+        {
             addUser(roomUser);
 
             if (markAsPlaying)
-                PlayingUserIds.Add(user.Id);
+                PlayingUserIds.Add(roomUser.UserID);
 
             return roomUser;
         }
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 2531f3c485..cb3711ebb5 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Tests.Visual.Spectator
         private readonly Dictionary<int, ReplayFrame> lastReceivedUserFrames = new Dictionary<int, ReplayFrame>();
 
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+        private readonly Dictionary<int, APIMod[]> userModsDictionary = new Dictionary<int, APIMod[]>();
         private readonly Dictionary<int, int> userNextFrameDictionary = new Dictionary<int, int>();
 
         [Resolved]
@@ -52,9 +53,11 @@ namespace osu.Game.Tests.Visual.Spectator
         /// </summary>
         /// <param name="userId">The user to start play for.</param>
         /// <param name="beatmapId">The playing beatmap id.</param>
-        public void SendStartPlay(int userId, int beatmapId)
+        /// <param name="mods">The mods the user has applied.</param>
+        public void SendStartPlay(int userId, int beatmapId, APIMod[]? mods = null)
         {
             userBeatmapDictionary[userId] = beatmapId;
+            userModsDictionary[userId] = mods ?? Array.Empty<APIMod>();
             userNextFrameDictionary[userId] = 0;
             sendPlayingState(userId);
         }
@@ -73,10 +76,12 @@ namespace osu.Game.Tests.Visual.Spectator
             {
                 BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
+                Mods = userModsDictionary[userId],
                 State = state
             });
 
             userBeatmapDictionary.Remove(userId);
+            userModsDictionary.Remove(userId);
         }
 
         /// <summary>
@@ -158,6 +163,7 @@ namespace osu.Game.Tests.Visual.Spectator
             {
                 BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
+                Mods = userModsDictionary[userId],
                 State = SpectatedUserState.Playing
             });
         }

From 1997519364810b178ddda6b7a21b6110737c4c39 Mon Sep 17 00:00:00 2001
From: apollo-dw <83023433+apollo-dw@users.noreply.github.com>
Date: Wed, 7 Sep 2022 13:24:54 +0100
Subject: [PATCH 150/709] Don't use full hit window in rhythm

---
 osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
index ca57c87af9..3bec2346ce 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/RhythmEvaluator.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
                 double lastDelta = lastObj.StrainTime;
                 double currRatio = 1.0 + 6.0 * Math.Min(0.5, Math.Pow(Math.Sin(Math.PI / (Math.Min(prevDelta, currDelta) / Math.Max(prevDelta, currDelta))), 2)); // fancy function to calculate rhythmbonuses.
 
-                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.6) / (currObj.HitWindowGreat * 0.6));
+                double windowPenalty = Math.Min(1, Math.Max(0, Math.Abs(prevDelta - currDelta) - currObj.HitWindowGreat * 0.3) / (currObj.HitWindowGreat * 0.3));
 
                 windowPenalty = Math.Min(1, windowPenalty);
 

From 208bd0f3914d77847fa49ed8815f67490d80b05c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Sep 2022 20:01:17 +0900
Subject: [PATCH 151/709] Give OnlinePlaySongSelect a reference PlaylistItem

---
 .../TestSceneMultiplayerMatchSongSelect.cs    |  4 +-
 .../Match/MultiplayerMatchSettingsOverlay.cs  |  5 --
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 23 ++----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 14 +---
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 72 +++++++++++++------
 5 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 2281235f25..0ecfc059e4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -152,8 +152,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public new BeatmapCarousel Carousel => base.Carousel;
 
-            public TestMultiplayerMatchSongSelect(Room room, WorkingBeatmap beatmap = null, RulesetInfo ruleset = null)
-                : base(room, null, beatmap, ruleset)
+            public TestMultiplayerMatchSongSelect(Room room)
+                : base(room)
             {
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index c2dafda592..75bd6eb04d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -4,7 +4,6 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -13,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -72,9 +70,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             private OsuSpriteText typeLabel = null!;
             private LoadingLayer loadingLayer = null!;
 
-            [Resolved]
-            private BeatmapManager beatmapManager { get; set; } = null!;
-
             public void SelectBeatmap()
             {
                 if (matchSubScreen.IsCurrentScreen())
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index dbd679104e..3fe236bd7a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -8,11 +8,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
@@ -27,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private OngoingOperationTracker operationTracker { get; set; } = null!;
 
         private readonly IBindable<bool> operationInProgress = new Bindable<bool>();
-        private readonly long? itemToEdit;
+        private readonly PlaylistItem? itemToEdit;
 
         private LoadingLayer loadingLayer = null!;
         private IDisposable? selectionOperation;
@@ -37,21 +35,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         /// </summary>
         /// <param name="room">The room.</param>
         /// <param name="itemToEdit">The item to be edited. May be null, in which case a new item will be added to the playlist.</param>
-        /// <param name="beatmap">An optional initial beatmap selection to perform.</param>
-        /// <param name="ruleset">An optional initial ruleset selection to perform.</param>
-        public MultiplayerMatchSongSelect(Room room, long? itemToEdit = null, WorkingBeatmap? beatmap = null, RulesetInfo? ruleset = null)
-            : base(room)
+        public MultiplayerMatchSongSelect(Room room, PlaylistItem? itemToEdit = null)
+            : base(room, itemToEdit)
         {
             this.itemToEdit = itemToEdit;
-
-            if (beatmap != null || ruleset != null)
-            {
-                Schedule(() =>
-                {
-                    if (beatmap != null) Beatmap.Value = beatmap;
-                    if (ruleset != null) Ruleset.Value = ruleset;
-                });
-            }
         }
 
         [BackgroundDependencyLoader]
@@ -80,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             if (operationInProgress.Value)
             {
-                Logger.Log($"{nameof(SelectedItem)} aborted due to {nameof(operationInProgress)}");
+                Logger.Log($"{nameof(SelectItem)} aborted due to {nameof(operationInProgress)}");
                 return false;
             }
 
@@ -92,7 +79,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
                 var multiplayerItem = new MultiplayerPlaylistItem
                 {
-                    ID = itemToEdit ?? 0,
+                    ID = itemToEdit?.ID ?? 0,
                     BeatmapID = item.Beatmap.OnlineID,
                     BeatmapChecksum = item.Beatmap.MD5Hash,
                     RulesetID = item.RulesetID,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ceadfa1527..db752f2b42 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -49,11 +49,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private MultiplayerClient client { get; set; }
 
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
-        private readonly IBindable<bool> isConnected = new Bindable<bool>();
-
         private AddItemButton addItemButton;
 
         public MultiplayerMatchSubScreen(Room room)
@@ -227,12 +222,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
                 return;
 
-            int id = itemToEdit?.Beatmap.OnlineID ?? Room.Playlist.Last().Beatmap.OnlineID;
-            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == id);
-
-            var workingBeatmap = localBeatmap == null ? null : beatmapManager.GetWorkingBeatmap(localBeatmap);
-
-            this.Push(new MultiplayerMatchSongSelect(Room, itemToEdit?.ID, workingBeatmap));
+            this.Push(new MultiplayerMatchSongSelect(Room, itemToEdit));
         }
 
         protected override Drawable CreateFooter() => new MultiplayerMatchFooter();
@@ -424,7 +414,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
             }
 
-            this.Push(new MultiplayerMatchSongSelect(Room, client.Room.Settings.PlaylistItemId, beatmap, ruleset));
+            this.Push(new MultiplayerMatchSongSelect(Room, Room.Playlist.Single(item => item.ID == client.Room.Settings.PlaylistItemId)));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index f26480909e..e841d9c41e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -1,13 +1,11 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using Humanizer;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -35,32 +33,39 @@ namespace osu.Game.Screens.OnlinePlay
         public override bool AllowEditing => false;
 
         [Resolved(typeof(Room), nameof(Room.Playlist))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
-
-        [CanBeNull]
-        [Resolved(CanBeNull = true)]
-        protected IBindable<PlaylistItem> SelectedItem { get; private set; }
+        protected BindableList<PlaylistItem> Playlist { get; private set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; } = null!;
 
         protected override UserActivity InitialActivity => new UserActivity.InLobby(room);
 
         protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private readonly Room room;
+        private readonly PlaylistItem? initialItem;
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
 
-        private WorkingBeatmap initialBeatmap;
-        private RulesetInfo initialRuleset;
-        private IReadOnlyList<Mod> initialMods;
+        private WorkingBeatmap initialBeatmap = null!;
+        private RulesetInfo initialRuleset = null!;
+        private IReadOnlyList<Mod> initialMods = null!;
         private bool itemSelected;
 
-        private readonly FreeModSelectOverlay freeModSelectOverlay;
-        private IDisposable freeModSelectOverlayRegistration;
+        private IDisposable? freeModSelectOverlayRegistration;
 
-        protected OnlinePlaySongSelect(Room room)
+        /// <summary>
+        /// Creates a new <see cref="OnlinePlaySongSelect"/>.
+        /// </summary>
+        /// <param name="room">The room.</param>
+        /// <param name="initialItem">An optional initial <see cref="PlaylistItem"/> to use for the initial beatmap/ruleset/mods.
+        /// If <c>null</c>, the last <see cref="PlaylistItem"/> in the room will be used.</param>
+        protected OnlinePlaySongSelect(Room room, PlaylistItem? initialItem = null)
         {
             this.room = room;
+            this.initialItem = initialItem ?? room.Playlist.LastOrDefault();
 
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
 
@@ -76,6 +81,7 @@ namespace osu.Game.Screens.OnlinePlay
         {
             LeftArea.Padding = new MarginPadding { Top = Header.HEIGHT };
 
+            // Store the initial beatmap/ruleset/mods at the point of entering song select, so they can be reverted to upon exit.
             initialBeatmap = Beatmap.Value;
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
@@ -87,14 +93,35 @@ namespace osu.Game.Screens.OnlinePlay
         {
             base.LoadComplete();
 
-            var rulesetInstance = SelectedItem?.Value?.RulesetID == null ? null : rulesets.GetRuleset(SelectedItem.Value.RulesetID)?.CreateInstance();
-
-            if (rulesetInstance != null)
+            if (initialItem != null)
             {
-                // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
-                // Similarly, freeMods is currently empty but should only contain the allowed mods.
-                Mods.Value = SelectedItem.Value.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
-                FreeMods.Value = SelectedItem.Value.AllowedMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+                // Prefer using a local databased beatmap lookup since OnlineId may be -1 for an invalid beatmap selection.
+                BeatmapInfo? beatmapInfo = initialItem.Beatmap as BeatmapInfo;
+
+                // And in the case that this isn't a local databased beatmap, query by online ID.
+                if (beatmapInfo == null)
+                {
+                    int onlineId = initialItem.Beatmap.OnlineID;
+                    beatmapInfo = beatmapManager.QueryBeatmap(b => b.OnlineID == onlineId);
+                }
+
+                if (beatmapInfo != null)
+                    Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmapInfo);
+
+                RulesetInfo? ruleset = rulesets.GetRuleset(initialItem.RulesetID);
+
+                if (ruleset != null)
+                {
+                    Ruleset.Value = ruleset;
+
+                    var rulesetInstance = ruleset.CreateInstance();
+                    Debug.Assert(rulesetInstance != null);
+
+                    // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
+                    // Similarly, freeMods is currently empty but should only contain the allowed mods.
+                    Mods.Value = initialItem.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+                    FreeMods.Value = initialItem.AllowedMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+                }
             }
 
             Mods.BindValueChanged(onModsChanged);
@@ -199,7 +226,6 @@ namespace osu.Game.Screens.OnlinePlay
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-
             freeModSelectOverlayRegistration?.Dispose();
         }
     }

From fcea244537db30790f77c758cce7717d44ef7d11 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Sep 2022 21:21:19 +0900
Subject: [PATCH 152/709] Remove initial selection from OnlinePlaySongSelect

This stuff never really worked anyway - every case except with an
already created multiplayer room was broken anyway.
---
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index e841d9c41e..ea20270c1e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -49,11 +49,6 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly PlaylistItem? initialItem;
         private readonly FreeModSelectOverlay freeModSelectOverlay;
 
-        private WorkingBeatmap initialBeatmap = null!;
-        private RulesetInfo initialRuleset = null!;
-        private IReadOnlyList<Mod> initialMods = null!;
-        private bool itemSelected;
-
         private IDisposable? freeModSelectOverlayRegistration;
 
         /// <summary>
@@ -80,12 +75,6 @@ namespace osu.Game.Screens.OnlinePlay
         private void load()
         {
             LeftArea.Padding = new MarginPadding { Top = Header.HEIGHT };
-
-            // Store the initial beatmap/ruleset/mods at the point of entering song select, so they can be reverted to upon exit.
-            initialBeatmap = Beatmap.Value;
-            initialRuleset = Ruleset.Value;
-            initialMods = Mods.Value.ToList();
-
             LoadComponent(freeModSelectOverlay);
         }
 
@@ -152,13 +141,7 @@ namespace osu.Game.Screens.OnlinePlay
                 AllowedMods = FreeMods.Value.Select(m => new APIMod(m)).ToArray()
             };
 
-            if (SelectItem(item))
-            {
-                itemSelected = true;
-                return true;
-            }
-
-            return false;
+            return SelectItem(item);
         }
 
         /// <summary>
@@ -181,15 +164,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnExiting(ScreenExitEvent e)
         {
-            if (!itemSelected)
-            {
-                Beatmap.Value = initialBeatmap;
-                Ruleset.Value = initialRuleset;
-                Mods.Value = initialMods;
-            }
-
             freeModSelectOverlay.Hide();
-
             return base.OnExiting(e);
         }
 

From 83c0cb1acce2fe9e6c27080651e82b413add1c5e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Sep 2022 21:22:26 +0900
Subject: [PATCH 153/709] Fix beatmap set to null after exiting song select

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 03216180fb..00c819e5e4 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -433,6 +433,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private void updateWorkingBeatmap()
         {
+            if (SelectedItem.Value == null || !this.IsCurrentScreen())
+                return;
+
             var beatmap = SelectedItem.Value?.Beatmap;
 
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info

From b560b6f7454983bf2275a76974a6c4c38e828ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Wed, 7 Sep 2022 23:29:10 +0900
Subject: [PATCH 154/709] refactor(osu.Game): arrange the code for the timing
 distribution graph

---
 .../HitEventTimingDistributionGraph.cs        | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 37765fe962..ad2f979138 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         private readonly IReadOnlyList<HitEvent> hitEvents;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         /// <summary>
         /// Creates a new <see cref="HitEventTimingDistributionGraph"/>.
         /// </summary>
@@ -129,13 +126,7 @@ namespace osu.Game.Screens.Ranking.Statistics
             else
             {
                 int maxCount = bins.Max(b => b.Values.Sum());
-                barDrawables = new Bar[total_timing_distribution_bins];
-
-                for (int i = 0; i < barDrawables.Length; i++)
-                {
-                    IReadOnlyList<BarValue> values = bins[i].Select(b => new BarValue(b.Key.OrderingIndex(), b.Value, colours.DrawForHitResult(b.Key))).OrderBy(b => b.Index).ToList();
-                    barDrawables[i] = new Bar(values, maxCount, i == timing_distribution_centre_bin_index);
-                }
+                barDrawables = bins.Select((bin, i) => new Bar(bins[i], maxCount, i == timing_distribution_centre_bin_index)).ToArray();
 
                 Container axisFlow;
 
@@ -216,53 +207,53 @@ namespace osu.Game.Screens.Ranking.Statistics
             }
         }
 
-        private readonly struct BarValue
-        {
-            public readonly int Index;
-            public readonly float Value;
-            public readonly Color4 Colour;
-
-            public BarValue(int index, float value, Color4 colour)
-            {
-                Index = index;
-                Value = value;
-                Colour = colour;
-            }
-        }
-
         private class Bar : CompositeDrawable
         {
             private float totalValue => values.Sum(v => v.Value);
             private float basalHeight => BoundingBox.Width / BoundingBox.Height;
             private float availableHeight => 1 - basalHeight;
 
-            private readonly IReadOnlyList<BarValue> values;
+            private readonly IReadOnlyList<KeyValuePair<HitResult, int>> values;
             private readonly float maxValue;
+            private readonly bool isCentre;
 
-            private readonly Circle[] boxOriginals;
+            private Circle[] boxOriginals;
             private Circle boxAdjustment;
 
-            public Bar(IReadOnlyList<BarValue> values, float maxValue, bool isCentre)
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            public Bar(IDictionary<HitResult, int> values, float maxValue, bool isCentre)
             {
-                this.values = values;
+                this.values = values.OrderBy(v => v.Key.OrderingIndex()).ToList();
                 this.maxValue = maxValue;
+                this.isCentre = isCentre;
 
                 RelativeSizeAxes = Axes.Both;
                 Masking = true;
+            }
 
+            [BackgroundDependencyLoader]
+            private void load()
+            {
                 if (values.Any())
                 {
-                    InternalChildren = boxOriginals = values.Select((v, i) => new Circle
+                    boxOriginals = values.Select((v, i) => new Circle
                     {
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = isCentre && i == 0 ? Color4.White : v.Colour,
+                        Colour = isCentre && i == 0 ? Color4.White : colours.DrawForHitResult(v.Key),
                         Height = 0,
                     }).ToArray();
+                    // The bars of the stacked bar graph will be processed (stacked) from the bottom, which is the base position,
+                    // to the top, and the bottom bar should be drawn more toward the front by design,
+                    // while the drawing order is from the back to the front, so the order passed to `InternalChildren` is the opposite.
+                    InternalChildren = boxOriginals.Reverse().ToArray();
                 }
                 else
                 {
+                    // A bin with no value draws a grey dot instead.
                     InternalChildren = boxOriginals = new[]
                     {
                         new Circle

From 54f0bb797e46bb581017482876bea3ca4aec83a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Wed, 7 Sep 2022 23:32:45 +0900
Subject: [PATCH 155/709] refactor(osu.Game): remove nullable optouts in
 HitResult.cs

---
 osu.Game/Rulesets/Scoring/HitResult.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 8078363212..3349bcf245 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

From 267465df182b67e783d13b015c646c4d501ad7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Wed, 7 Sep 2022 23:34:46 +0900
Subject: [PATCH 156/709] chore(osu.Game): combine
 `Osu.Colour.{Draw,Text}ForHitResult` into `OsuColour.ForHitResult`

---
 osu.Game/Graphics/OsuColour.cs                | 25 +------------------
 .../Leaderboards/LeaderboardScoreTooltip.cs   |  2 +-
 .../Judgements/DefaultJudgementPiece.cs       |  2 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  |  2 +-
 .../Expanded/Statistics/HitResultStatistic.cs |  2 +-
 .../HitEventTimingDistributionGraph.cs        |  2 +-
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 022b1a363f..91161d5c71 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -102,30 +102,7 @@ namespace osu.Game.Graphics
         /// <summary>
         /// Retrieves the colour for a <see cref="HitResult"/>.
         /// </summary>
-        public Color4 TextForHitResult(HitResult judgement)
-        {
-            switch (judgement)
-            {
-                case HitResult.Perfect:
-                case HitResult.Great:
-                    return Blue;
-
-                case HitResult.Ok:
-                case HitResult.Good:
-                    return Green;
-
-                case HitResult.Meh:
-                    return Yellow;
-
-                case HitResult.Miss:
-                    return Red;
-
-                default:
-                    return Color4.White;
-            }
-        }
-
-        public Color4 DrawForHitResult(HitResult result)
+        public Color4 ForHitResult(HitResult result)
         {
             switch (result)
             {
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 23d4e64191..2f3ece0e3b 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Online.Leaderboards
                         {
                             Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
                             Text = displayName.ToUpper(),
-                            Colour = colours.TextForHitResult(result),
+                            Colour = colours.ForHitResult(result),
                         },
                         new OsuSpriteText
                         {
diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index a854bf37f5..c2b27d4ce8 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Judgements
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Text = Result.GetDescription().ToUpperInvariant(),
-                    Colour = colours.TextForHitResult(Result),
+                    Colour = colours.ForHitResult(Result),
                     Font = OsuFont.Numeric.With(size: 20),
                     Scale = new Vector2(0.85f, 1),
                 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 35d28b8e98..dda17c25e6 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         protected Color4 GetColourForHitResult(HitResult result)
         {
-            return colours.DrawForHitResult(result);
+            return colours.ForHitResult(result);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
index 429b72c07c..c23a5e668d 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            HeaderText.Colour = colours.TextForHitResult(Result);
+            HeaderText.Colour = colours.ForHitResult(Result);
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index ad2f979138..52682c35a0 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = isCentre && i == 0 ? Color4.White : colours.DrawForHitResult(v.Key),
+                        Colour = isCentre && i == 0 ? Color4.White : colours.ForHitResult(v.Key),
                         Height = 0,
                     }).ToArray();
                     // The bars of the stacked bar graph will be processed (stacked) from the bottom, which is the base position,

From 68ea5a765f25f8d6a0df05d95076d9ff21ee8598 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Sep 2022 23:56:45 +0900
Subject: [PATCH 157/709] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 219912425f..cd4dfec3d7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.901.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.907.1" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 43e3076f5c..6d0827a107 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.901.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.907.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0f0bf2848c..3316bf5a49 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.901.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.907.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.901.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.907.1" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 50923b6e5b5722f59e4bbaaa8ef3f218117bd414 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 8 Sep 2022 00:25:55 +0300
Subject: [PATCH 158/709] Move track assignment below

---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 26fb127e83..20a5c95605 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -68,10 +68,11 @@ namespace osu.Game.Screens.Play
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double skipTargetTime)
             : base(beatmap.Track, true)
         {
-            track = beatmap.Track;
             this.beatmap = beatmap;
             this.skipTargetTime = skipTargetTime;
 
+            track = beatmap.Track;
+
             StartTime = findEarliestStartTime();
         }
 

From 3b116a1a474c786eb7beba91317dc43f31a9b93d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 13:17:27 +0900
Subject: [PATCH 159/709] Fix mods not being set on `BeginPlayingInternal`

---
 osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index cb3711ebb5..e6d8e473bb 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -130,6 +131,7 @@ namespace osu.Game.Tests.Visual.Spectator
             // Track the local user's playing beatmap ID.
             Debug.Assert(state.BeatmapID != null);
             userBeatmapDictionary[api.LocalUser.Value.Id] = state.BeatmapID.Value;
+            userModsDictionary[api.LocalUser.Value.Id] = state.Mods.ToArray();
 
             return ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
         }

From 6aac0bd4e96e9da903c22a86162b596108847335 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 13:43:37 +0900
Subject: [PATCH 160/709] Update test to account for the fact that SSDQ is not
 zero anymore

---
 .../Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index 34723e3329..5c9e9043a7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -78,8 +78,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("allow skin lookup", () => storyboard.UseSkinSprites = true);
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
+            AddAssert("sprites present", () => sprites.All(s => s.IsPresent));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(0, 1)));
-            AddAssert("zero width", () => sprites.All(s => s.ScreenSpaceDrawQuad.Width == 0));
+            AddAssert("sprites not present", () => sprites.All(s => s.IsPresent));
         }
 
         [Test]

From 3d9bf25c8afde4a8225035175f1ac4109955d757 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 14:49:43 +0900
Subject: [PATCH 161/709] Apply NRT to `TestScenePlaySongSelect`

Very mess.
---
 .../SongSelect/TestScenePlaySongSelect.cs     | 309 ++++++++++--------
 1 file changed, 172 insertions(+), 137 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 5db46e3097..cc8746959b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -1,10 +1,9 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -13,6 +12,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
@@ -46,11 +46,12 @@ namespace osu.Game.Tests.Visual.SongSelect
     [TestFixture]
     public class TestScenePlaySongSelect : ScreenTestScene
     {
-        private BeatmapManager manager;
-        private RulesetStore rulesets;
-        private MusicController music;
-        private WorkingBeatmap defaultBeatmap;
-        private TestSongSelect songSelect;
+        private BeatmapManager manager = null!;
+        private RulesetStore rulesets = null!;
+        private MusicController music = null!;
+        private WorkingBeatmap defaultBeatmap = null!;
+        private OsuConfigManager config = null!;
+        private TestSongSelect? songSelect;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -69,8 +70,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
         }
 
-        private OsuConfigManager config;
-
         public override void SetUpSteps()
         {
             base.SetUpSteps();
@@ -85,7 +84,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 songSelect = null;
             });
 
-            AddStep("delete all beatmaps", () => manager?.Delete());
+            AddStep("delete all beatmaps", () => manager.Delete());
         }
 
         [Test]
@@ -98,7 +97,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
             AddUntilStep("wait for placeholder hidden", () => getPlaceholder()?.State.Value == Visibility.Hidden);
 
-            AddStep("delete all beatmaps", () => manager?.Delete());
+            AddStep("delete all beatmaps", () => manager.Delete());
             AddUntilStep("wait for placeholder visible", () => getPlaceholder()?.State.Value == Visibility.Visible);
         }
 
@@ -144,7 +143,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
+            AddAssert("filter count is 1", () => songSelect?.FilterCount == 1);
         }
 
         [Test]
@@ -156,7 +155,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap selected = null;
+            WorkingBeatmap? selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
@@ -166,7 +165,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -179,7 +178,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap selected = null;
+            WorkingBeatmap? selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
@@ -189,7 +188,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Key(Key.Down);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -202,23 +201,23 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
 
-            WorkingBeatmap selected = null;
+            WorkingBeatmap? selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
-            AddUntilStep("wait for beatmaps to load", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
+            AddUntilStep("wait for beatmaps to load", () => songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
 
             AddStep("select next and enter", () =>
             {
-                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
-                                                   .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect.Carousel.SelectedBeatmapInfo)));
+                InputManager.MoveMouseTo(songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                    .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect!.Carousel.SelectedBeatmapInfo)));
 
                 InputManager.Click(MouseButton.Left);
 
                 InputManager.Key(Key.Enter);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
         }
 
@@ -231,14 +230,14 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             waitForInitialSelection();
 
-            WorkingBeatmap selected = null;
+            WorkingBeatmap? selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
 
             AddStep("select next and enter", () =>
             {
-                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
-                                                   .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect.Carousel.SelectedBeatmapInfo)));
+                InputManager.MoveMouseTo(songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>()
+                                                    .First(b => !((CarouselBeatmap)b.Item).BeatmapInfo.Equals(songSelect!.Carousel.SelectedBeatmapInfo)));
 
                 InputManager.PressButton(MouseButton.Left);
 
@@ -247,7 +246,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
         }
 
@@ -260,11 +259,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
 
-            AddStep("return", () => songSelect.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
-            AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
+            AddStep("return", () => songSelect!.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
+            AddAssert("filter count is 1", () => songSelect!.FilterCount == 1);
         }
 
         [Test]
@@ -278,13 +277,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
 
             AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
-            AddStep("return", () => songSelect.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
-            AddAssert("filter count is 2", () => songSelect.FilterCount == 2);
+            AddStep("return", () => songSelect!.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
+            AddAssert("filter count is 2", () => songSelect!.FilterCount == 2);
         }
 
         [Test]
@@ -295,7 +294,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
-            AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for not current", () => !songSelect!.IsCurrentScreen());
 
             AddStep("update beatmap", () =>
             {
@@ -304,9 +303,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(anotherBeatmap);
             });
 
-            AddStep("return", () => songSelect.MakeCurrent());
-            AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
-            AddAssert("carousel updated", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(Beatmap.Value.BeatmapInfo));
+            AddStep("return", () => songSelect!.MakeCurrent());
+            AddUntilStep("wait for current", () => songSelect!.IsCurrentScreen());
+            AddAssert("carousel updated", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(Beatmap.Value.BeatmapInfo) == true);
         }
 
         [Test]
@@ -318,15 +317,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
 
             checkMusicPlaying(true);
-            AddStep("select first", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.First()));
+            AddStep("select first", () => songSelect!.Carousel.SelectBeatmap(songSelect!.Carousel.BeatmapSets.First().Beatmaps.First()));
             checkMusicPlaying(true);
 
             AddStep("manual pause", () => music.TogglePause());
             checkMusicPlaying(false);
-            AddStep("select next difficulty", () => songSelect.Carousel.SelectNext(skipDifficulties: false));
+            AddStep("select next difficulty", () => songSelect!.Carousel.SelectNext(skipDifficulties: false));
             checkMusicPlaying(false);
 
-            AddStep("select next set", () => songSelect.Carousel.SelectNext());
+            AddStep("select next set", () => songSelect!.Carousel.SelectNext());
             checkMusicPlaying(true);
         }
 
@@ -366,13 +365,13 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestDummy()
         {
             createSongSelect();
-            AddUntilStep("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap);
+            AddUntilStep("dummy selected", () => songSelect!.CurrentBeatmap == defaultBeatmap);
 
-            AddUntilStep("dummy shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap == defaultBeatmap);
+            AddUntilStep("dummy shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap == defaultBeatmap);
 
             addManyTestMaps();
 
-            AddUntilStep("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
+            AddUntilStep("random map selected", () => songSelect!.CurrentBeatmap != defaultBeatmap);
         }
 
         [Test]
@@ -381,7 +380,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
             addManyTestMaps();
 
-            AddUntilStep("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
+            AddUntilStep("random map selected", () => songSelect!.CurrentBeatmap != defaultBeatmap);
 
             AddStep(@"Sort by Artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
             AddStep(@"Sort by Title", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Title));
@@ -398,7 +397,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
             addRulesetImportStep(2);
-            AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -408,13 +407,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
             addRulesetImportStep(2);
             addRulesetImportStep(1);
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
 
             changeRuleset(1);
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 1);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 1);
 
             changeRuleset(0);
-            AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -423,7 +422,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
             changeRuleset(0);
 
-            Live<BeatmapSetInfo> original = null!;
+            Live<BeatmapSetInfo>? original = null;
             int originalOnlineSetID = 0;
 
             AddStep(@"Sort by artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
@@ -431,12 +430,17 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("import original", () =>
             {
                 original = manager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).GetResultSafely();
-                originalOnlineSetID = original!.Value.OnlineID;
+
+                Debug.Assert(original != null);
+
+                originalOnlineSetID = original.Value.OnlineID;
             });
 
             // This will move the beatmap set to a different location in the carousel.
             AddStep("Update original with bogus info", () =>
             {
+                Debug.Assert(original != null);
+
                 original.PerformWrite(set =>
                 {
                     foreach (var beatmap in set.Beatmaps)
@@ -457,13 +461,19 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(testBeatmapSetInfo);
             }, 10);
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
 
-            Task<Live<BeatmapSetInfo>> updateTask = null!;
-            AddStep("update beatmap", () => updateTask = manager.ImportAsUpdate(new ProgressNotification(), new ImportTask(TestResources.GetQuickTestBeatmapForImport()), original.Value));
+            Task<Live<BeatmapSetInfo>?> updateTask = null!;
+
+            AddStep("update beatmap", () =>
+            {
+                Debug.Assert(original != null);
+
+                updateTask = manager.ImportAsUpdate(new ProgressNotification(), new ImportTask(TestResources.GetQuickTestBeatmapForImport()), original.Value);
+            });
             AddUntilStep("wait for update completion", () => updateTask.IsCompleted);
 
-            AddUntilStep("retained selection", () => songSelect.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
+            AddUntilStep("retained selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == originalOnlineSetID);
         }
 
         [Test]
@@ -473,13 +483,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
 
             addRulesetImportStep(2);
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
 
             addRulesetImportStep(0);
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            BeatmapInfo target = null;
+            BeatmapInfo? target = null;
 
             AddStep("select beatmap/ruleset externally", () =>
             {
@@ -490,10 +500,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(target));
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(target) == true);
 
             // this is an important check, to make sure updateComponentFromBeatmap() was actually run
-            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
+            AddUntilStep("selection shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -503,13 +513,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(2);
 
             addRulesetImportStep(2);
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Ruleset.OnlineID == 2);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Ruleset.OnlineID == 2);
 
             addRulesetImportStep(0);
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            BeatmapInfo target = null;
+            BeatmapInfo? target = null;
 
             AddStep("select beatmap/ruleset externally", () =>
             {
@@ -520,12 +530,12 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Ruleset.Value = rulesets.AvailableRulesets.First(r => r.OnlineID == 0);
             });
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(target));
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(target) == true);
 
             AddUntilStep("has correct ruleset", () => Ruleset.Value.OnlineID == 0);
 
             // this is an important check, to make sure updateComponentFromBeatmap() was actually run
-            AddUntilStep("selection shown on wedge", () => songSelect.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
+            AddUntilStep("selection shown on wedge", () => songSelect!.CurrentBeatmapDetailsBeatmap.BeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -543,12 +553,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("change ruleset", () =>
             {
                 SelectedMods.ValueChanged += onModChange;
-                songSelect.Ruleset.ValueChanged += onRulesetChange;
+                songSelect!.Ruleset.ValueChanged += onRulesetChange;
 
                 Ruleset.Value = new TaikoRuleset().RulesetInfo;
 
                 SelectedMods.ValueChanged -= onModChange;
-                songSelect.Ruleset.ValueChanged -= onRulesetChange;
+                songSelect!.Ruleset.ValueChanged -= onRulesetChange;
             });
 
             AddAssert("mods changed before ruleset", () => modChangeIndex < rulesetChangeIndex);
@@ -579,18 +589,18 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             createSongSelect();
             addManyTestMaps();
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
             bool startRequested = false;
 
             AddStep("set filter and finalize", () =>
             {
-                songSelect.StartRequested = () => startRequested = true;
+                songSelect!.StartRequested = () => startRequested = true;
 
-                songSelect.Carousel.Filter(new FilterCriteria { SearchText = "somestringthatshouldn'tbematchable" });
-                songSelect.FinaliseSelection();
+                songSelect!.Carousel.Filter(new FilterCriteria { SearchText = "somestringthatshouldn'tbematchable" });
+                songSelect!.FinaliseSelection();
 
-                songSelect.StartRequested = null;
+                songSelect!.StartRequested = null;
             });
 
             AddAssert("start not requested", () => !startRequested);
@@ -610,15 +620,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             // used for filter check below
             AddStep("allow convert display", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
-            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
-            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("has no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
 
-            BeatmapInfo target = null;
+            BeatmapInfo? target = null;
 
             int targetRuleset = differentRuleset ? 1 : 0;
 
@@ -632,24 +642,24 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
             AddAssert("selected only shows expected ruleset (plus converts)", () =>
             {
-                var selectedPanel = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item.State.Value == CarouselItemState.Selected);
+                var selectedPanel = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item.State.Value == CarouselItemState.Selected);
 
                 // special case for converts checked here.
                 return selectedPanel.ChildrenOfType<FilterableDifficultyIcon>().All(i =>
                     i.IsFiltered || i.Item.BeatmapInfo.Ruleset.OnlineID == targetRuleset || i.Item.BeatmapInfo.Ruleset.OnlineID == 0);
             });
 
-            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
+            AddUntilStep("carousel has correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(target));
 
-            AddStep("reset filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
+            AddStep("reset filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
 
             AddAssert("game still correct", () => Beatmap.Value?.BeatmapInfo.MatchesOnlineID(target) == true);
-            AddAssert("carousel still correct", () => songSelect.Carousel.SelectedBeatmapInfo.MatchesOnlineID(target));
+            AddAssert("carousel still correct", () => songSelect!.Carousel.SelectedBeatmapInfo.MatchesOnlineID(target));
         }
 
         [Test]
@@ -662,15 +672,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             changeRuleset(0);
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
-            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
-            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
+            AddUntilStep("has no selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
 
-            BeatmapInfo target = null;
+            BeatmapInfo? target = null;
 
             AddStep("select beatmap externally", () =>
             {
@@ -682,15 +692,15 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmapInfo != null);
+            AddUntilStep("has selection", () => songSelect!.Carousel.SelectedBeatmapInfo != null);
 
-            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
+            AddUntilStep("carousel has correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.MatchesOnlineID(target) == true);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(target));
 
-            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nononoo");
+            AddStep("set filter text", () => songSelect!.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nononoo");
 
             AddUntilStep("game lost selection", () => Beatmap.Value is DummyWorkingBeatmap);
-            AddAssert("carousel lost selection", () => songSelect.Carousel.SelectedBeatmapInfo == null);
+            AddAssert("carousel lost selection", () => songSelect!.Carousel.SelectedBeatmapInfo == null);
         }
 
         [Test]
@@ -711,11 +721,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
 
-            AddAssert("no mods selected", () => songSelect.Mods.Value.Count == 0);
+            AddAssert("no mods selected", () => songSelect!.Mods.Value.Count == 0);
         }
 
         [Test]
@@ -738,11 +748,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
 
-            AddAssert("autoplay still selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
+            AddAssert("autoplay still selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
         }
 
         [Test]
@@ -765,11 +775,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
 
-            AddAssert("only autoplay selected", () => songSelect.Mods.Value.Single() is ModAutoplay);
+            AddAssert("only autoplay selected", () => songSelect!.Mods.Value.Single() is ModAutoplay);
 
-            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
+            AddUntilStep("wait for return to ss", () => songSelect!.IsCurrentScreen());
 
-            AddAssert("relax returned", () => songSelect.Mods.Value.Single() is ModRelax);
+            AddAssert("relax returned", () => songSelect!.Mods.Value.Single() is ModRelax);
         }
 
         [Test]
@@ -778,10 +788,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             Guid? previousID = null;
             createSongSelect();
             addRulesetImportStep(0);
-            AddStep("Move to last difficulty", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.Last()));
-            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmapInfo.ID);
-            AddStep("Hide first beatmap", () => manager.Hide(songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First()));
-            AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmapInfo.ID == previousID);
+            AddStep("Move to last difficulty", () => songSelect!.Carousel.SelectBeatmap(songSelect!.Carousel.BeatmapSets.First().Beatmaps.Last()));
+            AddStep("Store current ID", () => previousID = songSelect!.Carousel.SelectedBeatmapInfo!.ID);
+            AddStep("Hide first beatmap", () => manager.Hide(songSelect!.Carousel.SelectedBeatmapSet!.Beatmaps.First()));
+            AddAssert("Selected beatmap has not changed", () => songSelect!.Carousel.SelectedBeatmapInfo?.ID == previousID);
         }
 
         [Test]
@@ -792,17 +802,24 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for selection", () => !Beatmap.IsDefault);
 
-            DrawableCarouselBeatmapSet set = null;
+            DrawableCarouselBeatmapSet set = null!;
             AddStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
+                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
             });
 
-            FilterableDifficultyIcon difficultyIcon = null;
+            FilterableDifficultyIcon difficultyIcon = null!;
+
             AddUntilStep("Find an icon", () =>
             {
-                return (difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
-                                            .FirstOrDefault(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex())) != null;
+                var foundIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
+                                   .FirstOrDefault(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
+
+                if (foundIcon == null)
+                    return false;
+
+                difficultyIcon = foundIcon;
+                return true;
             });
 
             AddStep("Click on a difficulty", () =>
@@ -815,21 +832,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
 
             double? maxBPM = null;
-            AddStep("Filter some difficulties", () => songSelect.Carousel.Filter(new FilterCriteria
+            AddStep("Filter some difficulties", () => songSelect!.Carousel.Filter(new FilterCriteria
             {
                 BPM = new FilterCriteria.OptionalRange<double>
                 {
-                    Min = maxBPM = songSelect.Carousel.SelectedBeatmapSet.MaxBPM,
+                    Min = maxBPM = songSelect!.Carousel.SelectedBeatmapSet!.MaxBPM,
                     IsLowerInclusive = true
                 }
             }));
 
-            BeatmapInfo filteredBeatmap = null;
-            FilterableDifficultyIcon filteredIcon = null;
+            BeatmapInfo? filteredBeatmap = null;
+            FilterableDifficultyIcon? filteredIcon = null;
 
             AddStep("Get filtered icon", () =>
             {
-                var selectedSet = songSelect.Carousel.SelectedBeatmapSet;
+                var selectedSet = songSelect!.Carousel.SelectedBeatmapSet;
+
+                Debug.Assert(selectedSet != null);
+
                 filteredBeatmap = selectedSet.Beatmaps.First(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(selectedSet, filteredBeatmap);
                 filteredIcon = set.ChildrenOfType<FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
@@ -842,7 +862,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmapInfo.Equals(filteredBeatmap));
+            AddAssert("Selected beatmap correct", () => songSelect!.Carousel.SelectedBeatmapInfo?.Equals(filteredBeatmap) == true);
         }
 
         [Test]
@@ -907,14 +927,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 manager.Import(TestResources.CreateTestBeatmapSetInfo(3, usableRulesets));
             });
 
-            DrawableCarouselBeatmapSet set = null;
+            DrawableCarouselBeatmapSet? set = null;
             AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
                 return set != null;
             });
 
-            FilterableDifficultyIcon difficultyIcon = null;
+            FilterableDifficultyIcon? difficultyIcon = null;
             AddUntilStep("Find an icon for different ruleset", () =>
             {
                 difficultyIcon = set.ChildrenOfType<FilterableDifficultyIcon>()
@@ -937,7 +957,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.OnlineID == 3);
 
-            AddAssert("Selected beatmap still same set", () => songSelect.Carousel.SelectedBeatmapInfo.BeatmapSet?.OnlineID == previousSetID);
+            AddAssert("Selected beatmap still same set", () => songSelect!.Carousel.SelectedBeatmapInfo?.BeatmapSet?.OnlineID == previousSetID);
             AddAssert("Selected beatmap is mania", () => Beatmap.Value.BeatmapInfo.Ruleset.OnlineID == 3);
         }
 
@@ -948,7 +968,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
-            BeatmapSetInfo imported = null;
+            BeatmapSetInfo? imported = null;
 
             AddStep("import huge difficulty count map", () =>
             {
@@ -956,20 +976,27 @@ namespace osu.Game.Tests.Visual.SongSelect
                 imported = manager.Import(TestResources.CreateTestBeatmapSetInfo(50, usableRulesets))?.Value;
             });
 
-            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported.Beatmaps.First()));
+            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported?.Beatmaps.First()));
 
-            DrawableCarouselBeatmapSet set = null;
+            DrawableCarouselBeatmapSet? set = null;
             AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
             {
-                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                set = songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
                 return set != null;
             });
 
-            GroupedDifficultyIcon groupIcon = null;
+            GroupedDifficultyIcon groupIcon = null!;
+
             AddUntilStep("Find group icon for different ruleset", () =>
             {
-                return (groupIcon = set.ChildrenOfType<GroupedDifficultyIcon>()
-                                       .FirstOrDefault(icon => icon.Items.First().BeatmapInfo.Ruleset.OnlineID == 3)) != null;
+                var foundIcon = set.ChildrenOfType<GroupedDifficultyIcon>()
+                                   .FirstOrDefault(icon => icon.Items.First().BeatmapInfo.Ruleset.OnlineID == 3);
+
+                if (foundIcon == null)
+                    return false;
+
+                groupIcon = foundIcon;
+                return true;
             });
 
             AddAssert("Check ruleset is osu!", () => Ruleset.Value.OnlineID == 0);
@@ -1004,7 +1031,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 // this ruleset change should be overridden by the present.
                 Ruleset.Value = getSwitchBeatmap().Ruleset;
 
-                songSelect.PresentScore(new ScoreInfo
+                songSelect!.PresentScore(new ScoreInfo
                 {
                     User = new APIUser { Username = "woo" },
                     BeatmapInfo = getPresentBeatmap(),
@@ -1012,7 +1039,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 });
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1038,10 +1065,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 // this beatmap change should be overridden by the present.
                 Beatmap.Value = manager.GetWorkingBeatmap(getSwitchBeatmap());
 
-                songSelect.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
+                songSelect!.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
             });
 
-            AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
+            AddUntilStep("wait for results screen presented", () => !songSelect!.IsCurrentScreen());
 
             AddAssert("check beatmap is correct for score", () => Beatmap.Value.BeatmapInfo.MatchesOnlineID(getPresentBeatmap()));
             AddAssert("check ruleset is correct for score", () => Ruleset.Value.OnlineID == 0);
@@ -1054,23 +1081,29 @@ namespace osu.Game.Tests.Visual.SongSelect
             createSongSelect();
 
             AddStep("toggle mod overlay on", () => InputManager.Key(Key.F1));
-            AddUntilStep("mod overlay shown", () => songSelect.ModSelect.State.Value == Visibility.Visible);
+            AddUntilStep("mod overlay shown", () => songSelect!.ModSelect.State.Value == Visibility.Visible);
 
             AddStep("toggle mod overlay off", () => InputManager.Key(Key.F1));
-            AddUntilStep("mod overlay hidden", () => songSelect.ModSelect.State.Value == Visibility.Hidden);
+            AddUntilStep("mod overlay hidden", () => songSelect!.ModSelect.State.Value == Visibility.Hidden);
         }
 
         private void waitForInitialSelection()
         {
             AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
-            AddUntilStep("wait for difficulty panels visible", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
+            AddUntilStep("wait for difficulty panels visible", () => songSelect!.Carousel.ChildrenOfType<DrawableCarouselBeatmap>().Any());
         }
 
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.IndexOf(info);
 
-        private NoResultsPlaceholder getPlaceholder() => songSelect.ChildrenOfType<NoResultsPlaceholder>().FirstOrDefault();
+        private NoResultsPlaceholder? getPlaceholder() => songSelect!.ChildrenOfType<NoResultsPlaceholder>().FirstOrDefault();
 
-        private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmapInfo);
+        private int getCurrentBeatmapIndex()
+        {
+            Debug.Assert(songSelect!.Carousel.SelectedBeatmapSet != null);
+            Debug.Assert(songSelect!.Carousel.SelectedBeatmapInfo != null);
+
+            return getBeatmapIndex(songSelect!.Carousel.SelectedBeatmapSet, songSelect!.Carousel.SelectedBeatmapInfo);
+        }
 
         private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, FilterableDifficultyIcon icon)
         {
@@ -1079,14 +1112,14 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void addRulesetImportStep(int id)
         {
-            Live<BeatmapSetInfo> imported = null;
+            Live<BeatmapSetInfo>? imported = null;
             AddStep($"import test map for ruleset {id}", () => imported = importForRuleset(id));
             // This is specifically for cases where the add is happening post song select load.
             // For cases where song select is null, the assertions are provided by the load checks.
-            AddUntilStep("wait for imported to arrive in carousel", () => songSelect == null || songSelect.Carousel.BeatmapSets.Any(s => s.ID == imported?.ID));
+            AddUntilStep("wait for imported to arrive in carousel", () => songSelect == null || songSelect!.Carousel.BeatmapSets.Any(s => s.ID == imported?.ID));
         }
 
-        private Live<BeatmapSetInfo> importForRuleset(int id) => manager.Import(TestResources.CreateTestBeatmapSetInfo(3, rulesets.AvailableRulesets.Where(r => r.OnlineID == id).ToArray()));
+        private Live<BeatmapSetInfo>? importForRuleset(int id) => manager.Import(TestResources.CreateTestBeatmapSetInfo(3, rulesets.AvailableRulesets.Where(r => r.OnlineID == id).ToArray()));
 
         private void checkMusicPlaying(bool playing) =>
             AddUntilStep($"music {(playing ? "" : "not ")}playing", () => music.IsPlaying == playing);
@@ -1098,8 +1131,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         private void createSongSelect()
         {
             AddStep("create song select", () => LoadScreen(songSelect = new TestSongSelect()));
-            AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
-            AddUntilStep("wait for carousel loaded", () => songSelect.Carousel.IsAlive);
+            AddUntilStep("wait for present", () => songSelect!.IsCurrentScreen());
+            AddUntilStep("wait for carousel loaded", () => songSelect!.Carousel.IsAlive);
         }
 
         /// <summary>
@@ -1123,12 +1156,14 @@ namespace osu.Game.Tests.Visual.SongSelect
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            rulesets?.Dispose();
+
+            if (rulesets.IsNotNull())
+                rulesets.Dispose();
         }
 
         private class TestSongSelect : PlaySongSelect
         {
-            public Action StartRequested;
+            public Action? StartRequested;
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 

From 7b079c134edae38793d3c98cd14ff2f205888525 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 15:48:04 +0900
Subject: [PATCH 162/709] Update test to actually test what was intended

---
 .../Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index 5c9e9043a7..54b0bc2080 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddAssert("sprites present", () => sprites.All(s => s.IsPresent));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(0, 1)));
-            AddAssert("sprites not present", () => sprites.All(s => s.IsPresent));
+            AddAssert("sprites not present", () => !sprites.All(s => s.IsPresent));
         }
 
         [Test]

From 9ead5e59d3262d1e18ec9ba5dce893f275385d0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 15:51:15 +0900
Subject: [PATCH 163/709] Fix incorrectly displaying minimum value in
 placeholder messaging

---
 osu.Game/Screens/Select/NoResultsPlaceholder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/NoResultsPlaceholder.cs b/osu.Game/Screens/Select/NoResultsPlaceholder.cs
index f44aa01588..73b53defe0 100644
--- a/osu.Game/Screens/Select/NoResultsPlaceholder.cs
+++ b/osu.Game/Screens/Select/NoResultsPlaceholder.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Select
                         config.SetValue(OsuSetting.DisplayStarsMaximum, 10.1);
                     });
 
-                    string lowerStar = filter.UserStarDifficulty.Min == null ? "0,0" : $"{filter.UserStarDifficulty.Min:N1}";
+                    string lowerStar = $"{filter.UserStarDifficulty.Min ?? 0:N1}";
                     string upperStar = filter.UserStarDifficulty.Max == null ? "∞" : $"{filter.UserStarDifficulty.Max:N1}";
 
                     textFlow.AddText($" the {lowerStar} - {upperStar} star difficulty filter.");

From d523a2ac339c88ade0176df1d9dbe26b678cbc7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 15:53:08 +0900
Subject: [PATCH 164/709] Rename default value field and make `private`

---
 .../Select/DifficultyRangeFilterControl.cs    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
index eb5a797ac0..45e7ff4caa 100644
--- a/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
+++ b/osu.Game/Screens/Select/DifficultyRangeFilterControl.cs
@@ -65,7 +65,10 @@ namespace osu.Game.Screens.Select
 
         private class MinimumStarsSlider : StarsSlider
         {
-            public MinimumStarsSlider() : base("0") { }
+            public MinimumStarsSlider()
+                : base("0")
+            {
+            }
 
             public override LocalisableString TooltipText => Current.Value.ToString(@"0.## stars");
 
@@ -86,7 +89,10 @@ namespace osu.Game.Screens.Select
 
         private class MaximumStarsSlider : StarsSlider
         {
-            public MaximumStarsSlider() : base("∞") { }
+            public MaximumStarsSlider()
+                : base("∞")
+            {
+            }
 
             protected override void LoadComplete()
             {
@@ -102,15 +108,15 @@ namespace osu.Game.Screens.Select
 
         private class StarsSlider : OsuSliderBar<double>
         {
+            private readonly string defaultString;
+
             public override LocalisableString TooltipText => Current.IsDefault
                 ? UserInterfaceStrings.NoLimit
                 : Current.Value.ToString(@"0.## stars");
 
-            protected readonly string DefaultValue;
-
-            public StarsSlider(string defaultValue)
+            protected StarsSlider(string defaultString)
             {
-                DefaultValue = defaultValue;
+                this.defaultString = defaultString;
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -138,7 +144,7 @@ namespace osu.Game.Screens.Select
 
                 Current.BindValueChanged(current =>
                 {
-                    currentDisplay.Text = current.NewValue != Current.Default ? current.NewValue.ToString("N1") : DefaultValue;
+                    currentDisplay.Text = current.NewValue != Current.Default ? current.NewValue.ToString("N1") : defaultString;
                 }, true);
             }
         }

From 9e42d6167fdd630c360ec6706a6cc5f20f9ce836 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 16:07:21 +0900
Subject: [PATCH 165/709] Fix tournament match scores resetting if `StartMatch`
 is called on an in-progress match

---
 osu.Game.Tournament/Models/TournamentMatch.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs
index 2f72dc9257..97c2060f2c 100644
--- a/osu.Game.Tournament/Models/TournamentMatch.cs
+++ b/osu.Game.Tournament/Models/TournamentMatch.cs
@@ -106,13 +106,16 @@ namespace osu.Game.Tournament.Models
         }
 
         /// <summary>
-        /// Initialise this match with zeroed scores. Will be a noop if either team is not present.
+        /// Initialise this match with zeroed scores. Will be a noop if either team is not present or if either of the scores are non-zero.
         /// </summary>
         public void StartMatch()
         {
             if (Team1.Value == null || Team2.Value == null)
                 return;
 
+            if (Team1Score.Value > 0 || Team2Score.Value > 0)
+                return;
+
             Team1Score.Value = 0;
             Team2Score.Value = 0;
         }

From b0b4da533a399327da175f01da06668f821b95e9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 16:59:20 +0900
Subject: [PATCH 166/709] Expose gameplay adjustments via MultiSpectatorPlayer
 instead

---
 .../Multiplayer/Spectate/MultiSpectatorPlayer.cs   | 14 ++++----------
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs   |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerArea.cs  |  8 ++++++++
 .../Multiplayer/Spectate/SpectatorPlayerClock.cs   |  3 ---
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 7e910b7946..32d0e66d90 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -13,6 +14,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public class MultiSpectatorPlayer : SpectatorPlayer
     {
+        public IAdjustableAudioComponent GameplayAdjustments => GameplayClockContainer.GameplayAdjustments;
+
         private readonly SpectatorPlayerClock spectatorPlayerClock;
 
         /// <summary>
@@ -53,15 +56,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-        {
-            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
-
-            // Directionality is important, as BindAdjustments is... not actually a bidirectional bind...
-            // We want to ensure that any adjustments applied by the Player instance are applied to the SpectatorPlayerClock
-            // so they can be consumed by the spectator screen (and applied to the master clock / track).
-            spectatorPlayerClock.GameplayAdjustments.BindAdjustments(gameplayClockContainer.GameplayAdjustments);
-
-            return gameplayClockContainer;
-        }
+            => new GameplayClockContainer(spectatorPlayerClock);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index b7c07372dc..617977bdde 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (boundAdjustments != null)
                 masterClockContainer.GameplayAdjustments.UnbindAdjustments(boundAdjustments);
 
-            boundAdjustments = first.SpectatorPlayerClock.GameplayAdjustments;
+            boundAdjustments = first.GameplayAdjustments;
             masterClockContainer.GameplayAdjustments.BindAdjustments(boundAdjustments);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 36f6631ebf..8ecb5adb76 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -42,6 +42,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public readonly SpectatorPlayerClock SpectatorPlayerClock;
 
+        /// <summary>
+        /// The gameplay adjustments applied by the <see cref="Player"/> loaded in this area.
+        /// </summary>
+        public readonly AudioAdjustments GameplayAdjustments = new AudioAdjustments();
+
         /// <summary>
         /// The currently-loaded score.
         /// </summary>
@@ -97,6 +102,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             {
                 var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
                 player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
+
+                GameplayAdjustments.BindAdjustments(player.GameplayAdjustments);
+
                 return player;
             }));
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
index 5667be1f4b..45615d4e19 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/SpectatorPlayerClock.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Audio;
 using osu.Framework.Timing;
 using osu.Game.Screens.Play;
 
@@ -20,8 +19,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly GameplayClockContainer masterClock;
 
-        public readonly AudioAdjustments GameplayAdjustments = new AudioAdjustments();
-
         public double CurrentTime { get; private set; }
 
         /// <summary>

From ed81297611bbe18d3df0beba6b6e07448df0b282 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 16:48:43 +0900
Subject: [PATCH 167/709] Fix playlist items showing download button briefly
 during initial local presence checks

---
 .../Beatmaps/TestSceneBeatmapCardDownloadButton.cs   |  2 ++
 .../Gameplay/TestScenePlayerLocalScoreImport.cs      |  4 +++-
 .../Visual/Gameplay/TestSceneReplayDownloadButton.cs |  2 +-
 .../Drawables/Cards/Buttons/DownloadButton.cs        | 12 ++++++++----
 osu.Game/Online/DownloadState.cs                     |  1 +
 .../Rooms/OnlinePlayBeatmapAvailabilityTracker.cs    |  1 +
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   |  4 ++++
 osu.Game/Screens/Play/SaveFailedScoreButton.cs       |  3 +--
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs
index 3308ffe714..10515fd95f 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables.Cards.Buttons;
 using osu.Game.Configuration;
+using osu.Game.Online;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
@@ -58,6 +59,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    State = { Value = DownloadState.NotDownloaded },
                     Scale = new Vector2(2)
                 };
             });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index f3e436e31f..247b822dc3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -81,9 +81,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             CreateTest();
 
             AddUntilStep("fail screen displayed", () => Player.ChildrenOfType<FailOverlay>().First().State.Value == Visibility.Visible);
+            AddUntilStep("wait for button clickable", () => Player.ChildrenOfType<SaveFailedScoreButton>().First().ChildrenOfType<OsuClickableContainer>().First().Enabled.Value);
+
             AddUntilStep("score not in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) == null));
             AddStep("click save button", () => Player.ChildrenOfType<SaveFailedScoreButton>().First().ChildrenOfType<OsuClickableContainer>().First().TriggerClick());
-            AddUntilStep("score not in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index 9d70d1ef33..cd227630c1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for load", () => downloadButton.IsLoaded);
 
-            AddAssert("state is not downloaded", () => downloadButton.State.Value == DownloadState.NotDownloaded);
+            AddAssert("state is unknown", () => downloadButton.State.Value == DownloadState.Unknown);
             AddAssert("button is not enabled", () => !downloadButton.ChildrenOfType<DownloadButton>().First().Enabled.Value);
         }
 
diff --git a/osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs b/osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs
index fdb43cb47e..1b15b2498c 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs
@@ -17,8 +17,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
 {
     public class DownloadButton : BeatmapCardIconButton
     {
-        public IBindable<DownloadState> State => state;
-        private readonly Bindable<DownloadState> state = new Bindable<DownloadState>();
+        public Bindable<DownloadState> State { get; } = new Bindable<DownloadState>();
 
         private readonly APIBeatmapSet beatmapSet;
 
@@ -48,14 +47,19 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
         {
             base.LoadComplete();
             preferNoVideo.BindValueChanged(_ => updateState());
-            state.BindValueChanged(_ => updateState(), true);
+            State.BindValueChanged(_ => updateState(), true);
             FinishTransforms(true);
         }
 
         private void updateState()
         {
-            switch (state.Value)
+            switch (State.Value)
             {
+                case DownloadState.Unknown:
+                    Action = null;
+                    TooltipText = string.Empty;
+                    break;
+
                 case DownloadState.Downloading:
                 case DownloadState.Importing:
                     Action = null;
diff --git a/osu.Game/Online/DownloadState.cs b/osu.Game/Online/DownloadState.cs
index a58c40d16a..f4ecb28b90 100644
--- a/osu.Game/Online/DownloadState.cs
+++ b/osu.Game/Online/DownloadState.cs
@@ -5,6 +5,7 @@ namespace osu.Game.Online
 {
     public enum DownloadState
     {
+        Unknown,
         NotDownloaded,
         Downloading,
         Importing,
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index bb8ec4f6ff..7f8f9703e4 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -114,6 +114,7 @@ namespace osu.Game.Online.Rooms
 
             switch (downloadTracker.State.Value)
             {
+                case DownloadState.Unknown:
                 case DownloadState.NotDownloaded:
                     availability.Value = BeatmapAvailability.NotDownloaded();
                     break;
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index beecd56b52..bda616d5c3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -561,6 +561,10 @@ namespace osu.Game.Screens.OnlinePlay
             {
                 switch (state.NewValue)
                 {
+                    case DownloadState.Unknown:
+                        // Ignore initial state to ensure the button doesn't briefly appear.
+                        break;
+
                     case DownloadState.LocallyAvailable:
                         // Perform a local query of the beatmap by beatmap checksum, and reset the state if not matching.
                         if (beatmapManager.QueryBeatmap(b => b.MD5Hash == beatmap.MD5Hash) == null)
diff --git a/osu.Game/Screens/Play/SaveFailedScoreButton.cs b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
index 3f6e741dff..7358ff3de4 100644
--- a/osu.Game/Screens/Play/SaveFailedScoreButton.cs
+++ b/osu.Game/Screens/Play/SaveFailedScoreButton.cs
@@ -63,8 +63,7 @@ namespace osu.Game.Screens.Play
             if (player != null)
             {
                 importedScore = realm.Run(r => r.Find<ScoreInfo>(player.Score.ScoreInfo.ID)?.Detach());
-                if (importedScore != null)
-                    state.Value = DownloadState.LocallyAvailable;
+                state.Value = importedScore != null ? DownloadState.LocallyAvailable : DownloadState.NotDownloaded;
             }
 
             state.BindValueChanged(state =>

From b559d4ecdf8dc6c4df4b6582bc34710d734d3b35 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 17:14:06 +0900
Subject: [PATCH 168/709] Rename GameplayAdjustments -> AdjustmentsFromMods

---
 .../NonVisual/GameplayClockContainerTest.cs           |  2 +-
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs       |  2 +-
 .../Multiplayer/Spectate/MultiSpectatorPlayer.cs      | 11 +++++++++--
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs      |  6 +++---
 .../OnlinePlay/Multiplayer/Spectate/PlayerArea.cs     |  6 +++---
 osu.Game/Screens/Play/GameplayClockContainer.cs       |  2 +-
 osu.Game/Screens/Play/GameplayClockExtensions.cs      |  4 ++--
 osu.Game/Screens/Play/IGameplayClock.cs               |  4 ++--
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs |  4 ++--
 osu.Game/Screens/Play/Player.cs                       |  2 +-
 10 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
index 80f0aaeb55..363c7a459e 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockContainerTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.NonVisual
             public TestGameplayClockContainer(IFrameBasedClock underlyingClock)
                 : base(underlyingClock)
             {
-                GameplayAdjustments.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
+                AdjustmentsFromMods.AddAdjustment(AdjustableProperty.Frequency, new BindableDouble(2.0));
             }
         }
     }
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index f0c7a398eb..6f57cfe2f7 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly AudioAdjustments gameplayAdjustments = new AudioAdjustments();
 
-        public IAdjustableAudioComponent GameplayAdjustments => parentGameplayClock?.GameplayAdjustments ?? gameplayAdjustments;
+        public IAdjustableAudioComponent AdjustmentsFromMods => parentGameplayClock?.AdjustmentsFromMods ?? gameplayAdjustments;
 
         #endregion
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 32d0e66d90..2d32bc7516 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -14,7 +14,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public class MultiSpectatorPlayer : SpectatorPlayer
     {
-        public IAdjustableAudioComponent GameplayAdjustments => GameplayClockContainer.GameplayAdjustments;
+        /// <summary>
+        /// All adjustments applied to the clock of this <see cref="MultiSpectatorPlayer"/> which come from mods.
+        /// </summary>
+        public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
 
         private readonly SpectatorPlayerClock spectatorPlayerClock;
 
@@ -56,6 +59,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new GameplayClockContainer(spectatorPlayerClock);
+        {
+            var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
+            ClockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
+            return gameplayClockContainer;
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 617977bdde..42a946a023 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -187,10 +187,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void bindAudioAdjustments(PlayerArea first)
         {
             if (boundAdjustments != null)
-                masterClockContainer.GameplayAdjustments.UnbindAdjustments(boundAdjustments);
+                masterClockContainer.AdjustmentsFromMods.UnbindAdjustments(boundAdjustments);
 
-            boundAdjustments = first.GameplayAdjustments;
-            masterClockContainer.GameplayAdjustments.BindAdjustments(boundAdjustments);
+            boundAdjustments = first.ClockAdjustmentsFromMods;
+            masterClockContainer.AdjustmentsFromMods.BindAdjustments(boundAdjustments);
         }
 
         private bool isCandidateAudioSource(SpectatorPlayerClock? clock)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 8ecb5adb76..585d464a2a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public readonly SpectatorPlayerClock SpectatorPlayerClock;
 
         /// <summary>
-        /// The gameplay adjustments applied by the <see cref="Player"/> loaded in this area.
+        /// The clock adjustments applied by the <see cref="Player"/> loaded in this area.
         /// </summary>
-        public readonly AudioAdjustments GameplayAdjustments = new AudioAdjustments();
+        public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
 
         /// <summary>
         /// The currently-loaded score.
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
                 player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
 
-                GameplayAdjustments.BindAdjustments(player.GameplayAdjustments);
+                ClockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
 
                 return player;
             }));
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e64c628fa0..35b79fd628 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
         /// </remarks>
         public double StartTime { get; protected set; }
 
-        public IAdjustableAudioComponent GameplayAdjustments { get; } = new AudioAdjustments();
+        public IAdjustableAudioComponent AdjustmentsFromMods { get; } = new AudioAdjustments();
 
         private readonly BindableBool isPaused = new BindableBool(true);
 
diff --git a/osu.Game/Screens/Play/GameplayClockExtensions.cs b/osu.Game/Screens/Play/GameplayClockExtensions.cs
index ec77a94ce9..5e88b41080 100644
--- a/osu.Game/Screens/Play/GameplayClockExtensions.cs
+++ b/osu.Game/Screens/Play/GameplayClockExtensions.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Screens.Play
             double rate = clock.Rate == 0 ? 1 : Math.Sign(clock.Rate);
 
             return rate
-                   * clock.GameplayAdjustments.AggregateFrequency.Value
-                   * clock.GameplayAdjustments.AggregateTempo.Value;
+                   * clock.AdjustmentsFromMods.AggregateFrequency.Value
+                   * clock.AdjustmentsFromMods.AggregateTempo.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
index c58d2dbcac..83ba5f3474 100644
--- a/osu.Game/Screens/Play/IGameplayClock.cs
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -19,9 +19,9 @@ namespace osu.Game.Screens.Play
         double StartTime { get; }
 
         /// <summary>
-        /// All adjustments applied to this clock which come from gameplay or mods.
+        /// All adjustments applied to this clock which come from mods.
         /// </summary>
-        IAdjustableAudioComponent GameplayAdjustments { get; }
+        IAdjustableAudioComponent AdjustmentsFromMods { get; }
 
         IBindable<bool> IsPaused { get; }
     }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 20a5c95605..047f25a111 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Play
 
             musicController.ResetTrackAdjustments();
 
-            track.BindAdjustments(GameplayAdjustments);
+            track.BindAdjustments(AdjustmentsFromMods);
             track.AddAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Play
             if (!speedAdjustmentsApplied)
                 return;
 
-            track.UnbindAdjustments(GameplayAdjustments);
+            track.UnbindAdjustments(AdjustmentsFromMods);
             track.RemoveAdjustment(AdjustableProperty.Frequency, GameplayClock.ExternalPauseFrequencyAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e93502da13..1732c6533e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -997,7 +997,7 @@ namespace osu.Game.Screens.Play
                 mod.ApplyToHUD(HUDOverlay);
 
             foreach (var mod in GameplayState.Mods.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(GameplayClockContainer.GameplayAdjustments);
+                mod.ApplyToTrack(GameplayClockContainer.AdjustmentsFromMods);
 
             updateGameplayState();
 

From c61c596c1f392c894e9511a3d2c4576e6ede0838 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 17:37:02 +0900
Subject: [PATCH 169/709] Expose as readonly IAggregateAudioAdjustment

---
 .../Multiplayer/Spectate/MultiSpectatorPlayer.cs       |  5 +++--
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs       |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerArea.cs      | 10 +++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 2d32bc7516..8e79c89685 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -17,8 +17,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// All adjustments applied to the clock of this <see cref="MultiSpectatorPlayer"/> which come from mods.
         /// </summary>
-        public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
+        public IAggregateAudioAdjustment ClockAdjustmentsFromMods => clockAdjustmentsFromMods;
 
+        private readonly AudioAdjustments clockAdjustmentsFromMods = new AudioAdjustments();
         private readonly SpectatorPlayerClock spectatorPlayerClock;
 
         /// <summary>
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
         {
             var gameplayClockContainer = new GameplayClockContainer(spectatorPlayerClock);
-            ClockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
+            clockAdjustmentsFromMods.BindAdjustments(gameplayClockContainer.AdjustmentsFromMods);
             return gameplayClockContainer;
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 42a946a023..1fd04d35f8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private MultiplayerClient multiplayerClient { get; set; } = null!;
 
-        private AudioAdjustments? boundAdjustments;
+        private IAggregateAudioAdjustment? boundAdjustments;
 
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer = null!;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 585d464a2a..8eee3d0fb6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// The clock adjustments applied by the <see cref="Player"/> loaded in this area.
         /// </summary>
-        public readonly AudioAdjustments ClockAdjustmentsFromMods = new AudioAdjustments();
+        public IAggregateAudioAdjustment ClockAdjustmentsFromMods => clockAdjustmentsFromMods;
 
         /// <summary>
         /// The currently-loaded score.
@@ -55,6 +55,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;
 
+        private readonly AudioAdjustments clockAdjustmentsFromMods = new AudioAdjustments();
         private readonly BindableDouble volumeAdjustment = new BindableDouble();
         private readonly Container gameplayContent;
         private readonly LoadingLayer loadingLayer;
@@ -101,9 +102,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             stack.Push(new MultiSpectatorPlayerLoader(Score, () =>
             {
                 var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
-                player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
 
-                ClockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
+                player.OnGameplayStarted += () =>
+                {
+                    clockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
+                    OnGameplayStarted?.Invoke();
+                };
 
                 return player;
             }));

From 76eae73fa4b66268c2bc87a82d330bbc130a9c7f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 17:41:23 +0900
Subject: [PATCH 170/709] Revert unintended change

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 8eee3d0fb6..96f134568d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -102,12 +102,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             stack.Push(new MultiSpectatorPlayerLoader(Score, () =>
             {
                 var player = new MultiSpectatorPlayer(Score, SpectatorPlayerClock);
+                player.OnGameplayStarted += () => OnGameplayStarted?.Invoke();
 
-                player.OnGameplayStarted += () =>
-                {
-                    clockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
-                    OnGameplayStarted?.Invoke();
-                };
+                clockAdjustmentsFromMods.BindAdjustments(player.ClockAdjustmentsFromMods);
 
                 return player;
             }));

From c6521e4c7274e3cdd7a681a817622bb01e719f20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 17:50:27 +0900
Subject: [PATCH 171/709] Rename ordering helper method

---
 osu.Game/Rulesets/Scoring/HitResult.cs                     | 7 ++-----
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 3349bcf245..96e13e5861 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -286,14 +286,11 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Ordered index of a <see cref="HitResult"/>. Used for sorting.
+        /// Ordered index of a <see cref="HitResult"/>. Used for consistent order when displaying hit results to the user.
         /// </summary>
         /// <param name="result">The <see cref="HitResult"/> to get the index of.</param>
         /// <returns>The index of <paramref name="result"/>.</returns>
-        public static int OrderingIndex(this HitResult result)
-        {
-            return order.IndexOf(result);
-        }
+        public static int GetIndexForOrderedDisplay(this HitResult result) => order.IndexOf(result);
     }
 #pragma warning restore CS0618
 }
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 52682c35a0..5335d77243 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -225,7 +225,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             public Bar(IDictionary<HitResult, int> values, float maxValue, bool isCentre)
             {
-                this.values = values.OrderBy(v => v.Key.OrderingIndex()).ToList();
+                this.values = values.OrderBy(v => v.Key.GetIndexForOrderedDisplay()).ToList();
                 this.maxValue = maxValue;
                 this.isCentre = isCentre;
 

From 0de220c45c502e618cf857b76f963471e54b8c26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 17:54:29 +0900
Subject: [PATCH 172/709] Change `IsExclusive` default value to `true`

---
 osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs | 1 -
 osu.Game/Online/Multiplayer/MatchStartCountdown.cs         | 1 -
 osu.Game/Online/Multiplayer/MultiplayerCountdown.cs        | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
index 81ba56f35c..bbfc5a02c6 100644
--- a/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs
@@ -15,6 +15,5 @@ namespace osu.Game.Online.Multiplayer
     [MessagePackObject]
     public sealed class ForceGameplayStartCountdown : MultiplayerCountdown
     {
-        public override bool IsExclusive => true;
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MatchStartCountdown.cs b/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
index b4c66e6f5b..fe65ebb059 100644
--- a/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MatchStartCountdown.cs
@@ -11,6 +11,5 @@ namespace osu.Game.Online.Multiplayer
     [MessagePackObject]
     public sealed class MatchStartCountdown : MultiplayerCountdown
     {
-        public override bool IsExclusive => true;
     }
 }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
index e8e2365f7b..61637ae970 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Whether only a single instance of this <see cref="MultiplayerCountdown"/> type may be active at any one time.
         /// </summary>
-        public virtual bool IsExclusive => false;
+        public virtual bool IsExclusive => true;
     }
 }

From 53219ae4e7c7d71dd38dcf12c25b95faeaf7fca8 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 8 Sep 2022 16:59:48 +0800
Subject: [PATCH 173/709] show fixed speed in mania scroll speed settings

---
 .../Configuration/ManiaRulesetConfigManager.cs         |  2 --
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs     | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 35ad21442e..8e09a01469 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 43d4aa77a2..51a45abd70 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -1,8 +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.
 
-#nullable disable
-
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -34,7 +33,7 @@ namespace osu.Game.Rulesets.Mania
                     LabelText = "Scrolling direction",
                     Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
-                new SettingsSlider<double, TimeSlider>
+                new SettingsSlider<double, ManiaScorllSlider>
                 {
                     LabelText = "Scroll speed",
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
@@ -47,5 +46,10 @@ namespace osu.Game.Rulesets.Mania
                 }
             };
         }
+
+        private class ManiaScorllSlider : OsuSliderBar<double>
+        {
+            public override LocalisableString TooltipText => $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value)} ({Current.Value}ms)";
+        }
     }
 }

From f0850c42e536178aceeb17a965c9b4e56aea0560 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 8 Sep 2022 18:16:23 +0900
Subject: [PATCH 174/709] fix typo

`ManiaScorllSlider` -> `ManiaScrollSlider`
---
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 51a45abd70..622450ac4a 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania
                     LabelText = "Scrolling direction",
                     Current = config.GetBindable<ManiaScrollingDirection>(ManiaRulesetSetting.ScrollDirection)
                 },
-                new SettingsSlider<double, ManiaScorllSlider>
+                new SettingsSlider<double, ManiaScrollSlider>
                 {
                     LabelText = "Scroll speed",
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania
             };
         }
 
-        private class ManiaScorllSlider : OsuSliderBar<double>
+        private class ManiaScrollSlider : OsuSliderBar<double>
         {
             public override LocalisableString TooltipText => $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value)} ({Current.Value}ms)";
         }

From 5c2fb3e43453febce253e83c74f5e78e0659bdcc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 18:22:53 +0900
Subject: [PATCH 175/709] Simplify calculation method

---
 .../ClicksPerSecondCalculator.cs              | 55 ++++++++-----------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 20ac923b82..b8cf20ee8f 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.UI;
@@ -11,56 +10,48 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 {
     public class ClicksPerSecondCalculator : Component
     {
-        private readonly List<double> timestamps;
+        private readonly List<double> timestamps = new List<double>();
 
         [Resolved]
         private IGameplayClock gameplayClock { get; set; } = null!;
 
-        [Resolved]
-        private DrawableRuleset drawableRuleset { get; set; } = null!;
-
-        private double rate;
-
-        // The latest timestamp GC seeked. Does not affect normal gameplay
-        // but prevents duplicate inputs on replays.
-        private double latestTime = double.NegativeInfinity;
+        [Resolved(canBeNull: true)]
+        private DrawableRuleset? drawableRuleset { get; set; }
 
         public int Value { get; private set; }
 
+        private IGameplayClock clock => drawableRuleset?.FrameStableClock ?? gameplayClock;
+
         public ClicksPerSecondCalculator()
         {
             RelativeSizeAxes = Axes.Both;
-            timestamps = new List<double>();
         }
 
+        public void AddInputTimestamp() => timestamps.Add(clock.CurrentTime);
+
         protected override void Update()
         {
             base.Update();
 
-            // When pausing in replays (using the space bar) GC.TrueGameplayRate returns 0
-            // To prevent CPS value being 0, we store and use the last non-zero TrueGameplayRate
-            if (gameplayClock.TrueGameplayRate > 0)
+            double latestValidTime = clock.CurrentTime;
+            double earliestTimeValid = latestValidTime - 1000 * gameplayClock.TrueGameplayRate;
+
+            int count = 0;
+
+            for (int i = timestamps.Count - 1; i >= 0; i--)
             {
-                rate = gameplayClock.TrueGameplayRate;
+                // handle rewinding by removing future timestamps as we go
+                if (timestamps[i] > latestValidTime)
+                {
+                    timestamps.RemoveAt(i);
+                    continue;
+                }
+
+                if (timestamps[i] >= earliestTimeValid)
+                    count++;
             }
 
-            Value = timestamps.Count(timestamp =>
-            {
-                double window = 1000 * rate;
-                double relativeTime = drawableRuleset.FrameStableClock.CurrentTime - timestamp;
-                return relativeTime > 0 && relativeTime <= window;
-            });
-        }
-
-        public void AddTimestamp()
-        {
-            // Discard inputs if current gameplay time is not the latest
-            // to prevent duplicate inputs
-            if (drawableRuleset.FrameStableClock.CurrentTime >= latestTime)
-            {
-                timestamps.Add(drawableRuleset.FrameStableClock.CurrentTime);
-                latestTime = drawableRuleset.FrameStableClock.CurrentTime;
-            }
+            Value = count;
         }
     }
 }

From 6729bb3e1a24e38c92caa542c3e67ddc1c59ad47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 18:23:54 +0900
Subject: [PATCH 176/709] Change `FrameStableClock` to inherit `IGameplayClock`

---
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs | 2 +-
 osu.Game/Rulesets/UI/IFrameStableClock.cs       | 4 ++--
 osu.Game/Rulesets/UI/RulesetInputManager.cs     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 18d0ff0bed..9446ba946b 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.UI
     /// </summary>
     [Cached(typeof(IGameplayClock))]
     [Cached(typeof(IFrameStableClock))]
-    public sealed class FrameStabilityContainer : Container, IHasReplayHandler, IFrameStableClock, IGameplayClock
+    public sealed class FrameStabilityContainer : Container, IHasReplayHandler, IFrameStableClock
     {
         public ReplayInputHandler? ReplayInputHandler { get; set; }
 
diff --git a/osu.Game/Rulesets/UI/IFrameStableClock.cs b/osu.Game/Rulesets/UI/IFrameStableClock.cs
index 569ef5e06c..4e50d059e9 100644
--- a/osu.Game/Rulesets/UI/IFrameStableClock.cs
+++ b/osu.Game/Rulesets/UI/IFrameStableClock.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Timing;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.UI
 {
-    public interface IFrameStableClock : IFrameBasedClock
+    public interface IFrameStableClock : IGameplayClock
     {
         IBindable<bool> IsCatchingUp { get; }
 
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index dcd2c4fb5d..1a97153f2f 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.UI
 
             public bool OnPressed(KeyBindingPressEvent<T> e)
             {
-                calculator.AddTimestamp();
+                calculator.AddInputTimestamp();
                 return false;
             }
 

From 07c16224d27fa38ba060f16bc2a3d227d4c2e96c Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Thu, 8 Sep 2022 11:58:14 +0200
Subject: [PATCH 177/709] Fix Main file issues

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 8901612b9b..0713469e10 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class ColourHitErrorMeter : HitErrorMeter
     {
-        private const int default_shape_alpha = 0;
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
 
@@ -35,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             MinValue = 0.01f,
             MaxValue = 1,
-            Precision = .01f,
+            Precision = 0.01f,
         };
 
         [SettingSource("Spacing", "Space between hit error shapes")]
@@ -43,10 +42,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             MinValue = 0,
             MaxValue = 10,
-            Precision = .1f
+            Precision = 0.1f
         };
 
-        [SettingSource("Shape", "What shape to use for hit errors")]
+        [SettingSource("Shape", "The shape of each displayed error")]
         public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>();
 
         private readonly JudgementFlow judgementsFlow;
@@ -81,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }, true);
             HitShape.BindValueChanged(_ =>
             {
-                judgementsFlow.ValueParser = getShapeStyle(HitShape.Value);
+                judgementsFlow.Shape = getShapeStyle(HitShape.Value);
                 judgementsFlow.Clear();
             }, true);
         }
@@ -91,7 +90,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private class JudgementFlow : FillFlowContainer<HitErrorShape>
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
-            internal string ValueParser = null!;
+            internal string Shape = null!;
 
             public JudgementFlow()
             {
@@ -103,7 +102,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             public void Push(Color4 colour, int maxErrorShapeCount)
             {
-                Add(new HitErrorShape(colour, drawable_judgement_size, ValueParser));
+                Add(new HitErrorShape(colour, drawable_judgement_size, Shape));
 
                 if (Children.Count > maxErrorShapeCount)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
@@ -124,7 +123,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                         Child = new Circle
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = default_shape_alpha,
+                            Alpha = 0,
                             Colour = colour
                         };
                         break;
@@ -133,7 +132,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                         Child = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = default_shape_alpha,
+                            Alpha = 0,
                             Colour = colour
                         };
                         break;

From ee094e3a858e409f21b20602438595d8a770d372 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:05:13 +0900
Subject: [PATCH 178/709] Rewrite tests

---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 292 +++---------------
 1 file changed, 50 insertions(+), 242 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index a140460251..ed5102e3b3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -3,22 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD.ClicksPerSecond;
 using osuTK;
@@ -27,290 +16,109 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneClicksPerSecond : OsuTestScene
     {
-        private DependencyProvidingContainer dependencyContainer = null!;
         private ClicksPerSecondCalculator calculator = null!;
-        private GameplayClockContainer gameplayClockContainer = null!;
-        private ManualClock manualClock = null!;
-        private DrawableRuleset? drawableRuleset;
-        private IFrameStableClock? frameStableClock;
+
+        private TestGameplayClock manualGameplayClock = null!;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
             AddStep("create components", () =>
             {
-                var ruleset = CreateRuleset();
+                manualGameplayClock = new TestGameplayClock();
 
-                Debug.Assert(ruleset != null);
-
-                Child = gameplayClockContainer = new GameplayClockContainer(manualClock = new ManualClock());
-                gameplayClockContainer.AddRange(new Drawable[]
+                Child = new DependencyProvidingContainer
                 {
-                    drawableRuleset = new TestDrawableRuleset(frameStableClock = new TestFrameStableClock(manualClock)),
-                    dependencyContainer = new DependencyProvidingContainer
+                    RelativeSizeAxes = Axes.Both,
+                    CachedDependencies = new (Type, object)[] { (typeof(IGameplayClock), manualGameplayClock) },
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        CachedDependencies = new (Type, object)[]
+                        calculator = new ClicksPerSecondCalculator(),
+                        new DependencyProvidingContainer
                         {
-                            (typeof(DrawableRuleset), drawableRuleset),
-                            (typeof(IGameplayClock), gameplayClockContainer)
+                            RelativeSizeAxes = Axes.Both,
+                            CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
+                            Child = new ClicksPerSecondCounter
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Scale = new Vector2(5),
+                            }
                         }
-                    }
-                });
+                    },
+                };
             });
         }
 
         [Test]
         public void TestBasicConsistency()
         {
-            createCalculator();
-            startClock();
-
-            AddStep("Create gradually increasing KPS inputs", () =>
-            {
-                addInputs(generateGraduallyIncreasingKps());
-            });
-
-            for (int i = 0; i < 10; i++)
-            {
-                seek(i * 10000);
-                advanceForwards(2);
-                int kps = i + 1;
-                AddAssert($"{kps} KPS", () => calculator.Value == kps);
-            }
+            seek(1000);
+            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
+            checkClicksPerSecondValue(10);
         }
 
         [Test]
         public void TestRateAdjustConsistency()
         {
-            createCalculator();
-            startClock();
-
-            AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
-
-            advanceForwards(2);
-
-            for (double i = 1; i <= 2; i += 0.25)
-            {
-                changeRate(i);
-                double rate = i;
-                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator.Value, 10 * rate, 0.5));
-            }
-
-            for (double i = 1; i >= 0.5; i -= 0.25)
-            {
-                changeRate(i);
-                double rate = i;
-                AddAssert($"KPS approx. = {i}", () => MathHelper.ApproximatelyEquivalent(calculator.Value, 10 * rate, 0.5));
-            }
+            seek(1000);
+            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
+            checkClicksPerSecondValue(10);
+            AddStep("set rate 0.5x", () => manualGameplayClock.TrueGameplayRate = 0.5);
+            checkClicksPerSecondValue(5);
         }
 
         [Test]
         public void TestInputsDiscardedOnRewind()
         {
-            createCalculator();
-            startClock();
-
-            AddStep("Create consistent KPS inputs", () => addInputs(generateConsistentKps(10)));
             seek(1000);
-
-            AddAssert("KPS = 10", () => calculator.Value == 10);
-
-            AddStep("Create delayed inputs", () => addInputs(generateConsistentKps(10, 50)));
+            AddStep("add inputs in past", () => addInputs(new double[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 }));
+            checkClicksPerSecondValue(10);
+            seek(500);
+            checkClicksPerSecondValue(6);
             seek(1000);
-            AddAssert("KPS didn't changed", () => calculator.Value == 10);
+            checkClicksPerSecondValue(6);
         }
 
-        private void seekAllClocks(double time)
-        {
-            gameplayClockContainer.Seek(time);
-            manualClock.CurrentTime = time;
-        }
+        private void checkClicksPerSecondValue(int i) => AddAssert("clicks/s is correct", () => calculator.Value, () => Is.EqualTo(i));
 
-        protected override Ruleset CreateRuleset() => new OsuRuleset();
+        private void seekClockImmediately(double time) => manualGameplayClock.CurrentTime = time;
 
-        #region Quick steps methods
-
-        private void createCalculator()
-        {
-            AddStep("create calculator", () =>
-            {
-                dependencyContainer.Children = new Drawable[]
-                {
-                    calculator = new ClicksPerSecondCalculator(),
-                    new DependencyProvidingContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        CachedDependencies = new (Type, object)[] { (typeof(ClicksPerSecondCalculator), calculator) },
-                        Child = new ClicksPerSecondCounter // For visual debugging, has no real purpose in the tests
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Scale = new Vector2(5),
-                        }
-                    }
-                };
-            });
-        }
-
-        private void seek(double time) => AddStep($"Seek clocks to {time}ms", () => seekAllClocks(time));
-
-        private void changeRate(double rate) => AddStep($"Change rate to x{rate}", () => manualClock.Rate = rate);
-
-        private void advanceForwards(double time) =>
-            AddStep($"Advance clocks {time} seconds forward.", () =>
-            {
-                gameplayClockContainer.Seek(gameplayClockContainer.CurrentTime + time * manualClock.Rate);
-
-                for (int i = 0; i < time; i++)
-                {
-                    frameStableClock?.ProcessFrame();
-                }
-            });
-
-        private void startClock() => AddStep("Start clocks", () =>
-        {
-            gameplayClockContainer.Start();
-            manualClock.Rate = 1;
-        });
-
-        #endregion
-
-        #region Input generation
+        private void seek(double time) => AddStep($"Seek to {time}ms", () => seekClockImmediately(time));
 
         private void addInputs(IEnumerable<double> inputs)
         {
-            if (!inputs.Any()) return;
-
-            double baseTime = gameplayClockContainer.CurrentTime;
+            double baseTime = manualGameplayClock.CurrentTime;
 
             foreach (double timestamp in inputs)
             {
-                seekAllClocks(timestamp);
-                calculator.AddTimestamp();
+                seekClockImmediately(timestamp);
+                calculator.AddInputTimestamp();
             }
 
-            seekAllClocks(baseTime);
+            seekClockImmediately(baseTime);
         }
 
-        private IEnumerable<double> generateGraduallyIncreasingKps()
+        private class TestGameplayClock : IGameplayClock
         {
-            IEnumerable<double> final = null!;
+            public double CurrentTime { get; set; }
 
-            for (int i = 1; i <= 10; i++)
-            {
-                var currentKps = generateConsistentKps(i, (i - 1) * 10000);
+            public double Rate => 1;
 
-                if (i == 1)
-                {
-                    final = currentKps;
-                    continue;
-                }
+            public bool IsRunning => true;
 
-                final = final.Concat(currentKps);
-            }
-
-            return final;
-        }
-
-        private IEnumerable<double> generateConsistentKps(double kps, double start = 0, double duration = 10)
-        {
-            double end = start + 1000 * duration;
-
-            for (; start < end; start += 1000 / kps)
-            {
-                yield return start;
-            }
-        }
-
-        #endregion
-
-        #region Test classes
-
-        private class TestFrameStableClock : IFrameStableClock
-        {
-            public TestFrameStableClock(IClock source, double startTime = 0)
-            {
-                this.source = source;
-
-                if (source is ManualClock manualClock)
-                {
-                    manualClock.CurrentTime = startTime;
-                }
-            }
-
-            public double CurrentTime => source.CurrentTime;
-            public double Rate => source.Rate;
-            public bool IsRunning => source.IsRunning;
-
-            private readonly IClock source;
+            public double TrueGameplayRate { get; set; } = 1;
 
             public void ProcessFrame()
             {
-                if (source is ManualClock manualClock)
-                {
-                    manualClock.CurrentTime += 1000 * Rate;
-                }
-
-                TimeInfo = new FrameTimeInfo
-                {
-                    Elapsed = 1000 * Rate,
-                    Current = CurrentTime
-                };
             }
 
-            public double ElapsedFrameTime => TimeInfo.Elapsed;
-            public double FramesPerSecond => 1 / ElapsedFrameTime * 1000;
-            public FrameTimeInfo TimeInfo { get; private set; }
-
-            public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
-            public IBindable<bool> IsCatchingUp => new Bindable<bool>();
-            public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
+            public double ElapsedFrameTime => throw new NotImplementedException();
+            public double FramesPerSecond => throw new NotImplementedException();
+            public FrameTimeInfo TimeInfo => throw new NotImplementedException();
+            public double StartTime => throw new NotImplementedException();
+            public IEnumerable<double> NonGameplayAdjustments => throw new NotImplementedException();
+            public IBindable<bool> IsPaused => throw new NotImplementedException();
         }
-
-        [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
-        private class TestDrawableRuleset : DrawableRuleset
-        {
-            public override IEnumerable<HitObject> Objects => Enumerable.Empty<HitObject>();
-
-            public override event Action<JudgementResult> NewResult
-            {
-                add => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException($"{nameof(NewResult)} operations not supported in test context");
-            }
-
-            public override event Action<JudgementResult> RevertResult
-            {
-                add => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
-                remove => throw new InvalidOperationException($"{nameof(RevertResult)} operations not supported in test context");
-            }
-
-            public override Playfield Playfield => null!;
-            public override Container Overlays => null!;
-            public override Container FrameStableComponents => null!;
-            public override IFrameStableClock FrameStableClock { get; }
-
-            internal override bool FrameStablePlayback { get; set; }
-            public override IReadOnlyList<Mod> Mods => Array.Empty<Mod>();
-
-            public override double GameplayStartTime => 0;
-            public override GameplayCursorContainer Cursor => null!;
-
-            public TestDrawableRuleset(IFrameStableClock frameStableClock)
-                : base(new OsuRuleset())
-            {
-                FrameStableClock = frameStableClock;
-            }
-
-            public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();
-
-            public override void SetRecordTarget(Score score) => throw new NotImplementedException();
-
-            public override void RequestResume(Action continueResume) => throw new NotImplementedException();
-
-            public override void CancelResume() => throw new NotImplementedException();
-        }
-
-        #endregion
     }
 }

From a98c6b2c1f43e910045cc75a879452a732268be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:14:23 +0900
Subject: [PATCH 179/709] Add comment metioning why we need to use
 `DrawableRuleset` lookup

---
 .../Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index b8cf20ee8f..82bf9cfa1e 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
 
         public int Value { get; private set; }
 
+        // Even though `FrameStabilityContainer` caches as a `GameplayClock`, we need to check it directly via `drawableRuleset`
+        // as this calculator is not contained within the `FrameStabilityContainer` and won't see the dependency.
         private IGameplayClock clock => drawableRuleset?.FrameStableClock ?? gameplayClock;
 
         public ClicksPerSecondCalculator()

From 15a4eb46c4d3ea9cf387116837733fc741bd53bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:20:26 +0900
Subject: [PATCH 180/709] Rename test scene to match class name

---
 ...ClicksPerSecond.cs => TestSceneClicksPerSecondCalculator.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneClicksPerSecond.cs => TestSceneClicksPerSecondCalculator.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
index ed5102e3b3..b740c06e03 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneClicksPerSecond : OsuTestScene
+    public class TestSceneClicksPerSecondCalculator : OsuTestScene
     {
         private ClicksPerSecondCalculator calculator = null!;
 

From 8de896a393d14af7c78b17b8f11eaf6d808383d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:21:15 +0900
Subject: [PATCH 181/709] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index cd4dfec3d7..2c186a52dd 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.907.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.908.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6d0827a107..fabef87c28 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.907.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3316bf5a49..89166f924c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.907.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.908.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.907.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From c585f08a3bd3895bea3c5a94a3daf5043ed7baf1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 19:42:09 +0900
Subject: [PATCH 182/709] Fix still inverted condition

---
 .../Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
index 54b0bc2080..3fc456c411 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("create sprites", () => SetContents(_ => createSprite(lookup_name, Anchor.TopLeft, Vector2.Zero)));
             AddAssert("sprites present", () => sprites.All(s => s.IsPresent));
             AddStep("scale sprite", () => sprites.ForEach(s => s.VectorScale = new Vector2(0, 1)));
-            AddAssert("sprites not present", () => !sprites.All(s => s.IsPresent));
+            AddAssert("sprites not present", () => sprites.All(s => !s.IsPresent));
         }
 
         [Test]

From 4f22616860df51d79b4f7c7e110d0621047da1c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:41:04 +0900
Subject: [PATCH 183/709] Rename class to match osu! version

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs | 8 ++++----
 .../UI/{TouchInputField.cs => CatchTouchInputMapper.cs}   | 2 +-
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Catch/UI/{TouchInputField.cs => CatchTouchInputMapper.cs} (99%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
index 24afda4cfa..b510a69f14 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
@@ -12,19 +12,19 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneCatchTouchInput : OsuTestScene
     {
-        private TouchInputField touchInputField = null!;
+        private CatchTouchInputMapper catchTouchInputMapper = null!;
 
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create inputfield", () =>
+            AddStep("create input overlay", () =>
             {
                 Child = new CatchInputManager(new CatchRuleset().RulesetInfo)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        touchInputField = new TouchInputField
+                        catchTouchInputMapper = new CatchTouchInputMapper
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestInputField()
         {
-            AddStep("show inputfield", () => touchInputField.Show());
+            AddStep("show overlay", () => catchTouchInputMapper.Show());
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
similarity index 99%
rename from osu.Game.Rulesets.Catch/UI/TouchInputField.cs
rename to osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 80453d6aa3..7607bf60cd 100644
--- a/osu.Game.Rulesets.Catch/UI/TouchInputField.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -16,7 +16,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class TouchInputField : VisibilityContainer
+    public class CatchTouchInputMapper : VisibilityContainer
     {
         public enum TouchCatchAction
         {
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index b84d0c60d5..ef2936ac94 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            KeyBindingInputManager.Add(new TouchInputField());
+            KeyBindingInputManager.Add(new CatchTouchInputMapper());
         }
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);

From b9afe6f4cf86416eba1497cdeaf56ce7ed82cae6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 19:44:29 +0900
Subject: [PATCH 184/709] Tidy up code quality

---
 .../UI/CatchTouchInputMapper.cs               | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 7607bf60cd..bdbd958f6a 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -18,28 +18,17 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchTouchInputMapper : VisibilityContainer
     {
-        public enum TouchCatchAction
-        {
-            MoveLeft = 0,
-            MoveRight = 1,
-            DashLeft = 2,
-            DashRight = 3,
-            None = 4
-        }
-
         private Dictionary<object, TouchCatchAction> trackedActions = new Dictionary<object, TouchCatchAction>();
 
         private KeyBindingContainer<CatchAction> keyBindingContainer = null!;
 
         private Container mainContent = null!;
 
-        // Fill values with null because UI is not declared in constructor
         private ArrowHitbox leftBox = null!;
         private ArrowHitbox rightBox = null!;
         private ArrowHitbox leftDashBox = null!;
         private ArrowHitbox rightDashBox = null!;
 
-        // Force input to be prossed even when hidden.
         public override bool PropagatePositionalInputSubTree => true;
         public override bool PropagateNonPositionalInputSubTree => true;
 
@@ -151,11 +140,6 @@ namespace osu.Game.Rulesets.Catch.UI
             return true;
         }
 
-        protected override void OnDragEnd(DragEndEvent e)
-        {
-            base.OnDragEnd(e);
-        }
-
         protected override void OnDrag(DragEvent e)
         {
             // I'm not sure if this is posible but let's be safe
@@ -167,6 +151,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             base.OnDrag(e);
         }
+
         protected override void OnTouchMove(TouchMoveEvent e)
         {
             // I'm not sure if this is posible but let's be safe
@@ -240,6 +225,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 return TouchCatchAction.MoveLeft;
             if (rightBox.Contains(inputPosition))
                 return TouchCatchAction.MoveRight;
+
             return TouchCatchAction.None;
         }
 
@@ -316,5 +302,14 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             }
         }
+
+        public enum TouchCatchAction
+        {
+            MoveLeft = 0,
+            MoveRight = 1,
+            DashLeft = 2,
+            DashRight = 3,
+            None = 4
+        }
     }
 }

From a90ca94a18b3be9db81cbc8c21648dcb4e4fb412 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 19:51:28 +0900
Subject: [PATCH 185/709] Remove outdated tests

---
 .../TestSceneMultiplayerMatchSongSelect.cs    | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 0ecfc059e4..b87321c047 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -19,7 +19,6 @@ using osu.Game.Database;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -68,37 +67,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen() && songSelect.BeatmapSetsLoaded);
         }
 
-        [Test]
-        public void TestBeatmapRevertedOnExitIfNoSelection()
-        {
-            BeatmapInfo selectedBeatmap = null;
-
-            AddStep("select beatmap",
-                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.Where(beatmap => beatmap.Ruleset.OnlineID == new OsuRuleset().LegacyID).ElementAt(1)));
-            AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
-
-            AddStep("exit song select", () => songSelect.Exit());
-            AddAssert("beatmap reverted", () => Beatmap.IsDefault);
-        }
-
-        [Test]
-        public void TestModsRevertedOnExitIfNoSelection()
-        {
-            AddStep("change mods", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });
-
-            AddStep("exit song select", () => songSelect.Exit());
-            AddAssert("mods reverted", () => SelectedMods.Value.Count == 0);
-        }
-
-        [Test]
-        public void TestRulesetRevertedOnExitIfNoSelection()
-        {
-            AddStep("change ruleset", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
-
-            AddStep("exit song select", () => songSelect.Exit());
-            AddAssert("ruleset reverted", () => Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
-        }
-
         [Test]
         public void TestBeatmapConfirmed()
         {

From 09fa24c563a8cf476bcf11d88228aadee486c15b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 8 Sep 2022 19:12:54 +0800
Subject: [PATCH 186/709] new display format

---
 .../Configuration/ManiaRulesetConfigManager.cs                  | 2 +-
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 8e09a01469..64e1f75e2c 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
                 scrollTime => new SettingDescription(
                     rawValue: scrollTime,
                     name: "Scroll Speed",
-                    value: $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime)} ({scrollTime}ms)"
+                    value: $"{scrollTime}ms (speed {(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / scrollTime)})"
                 )
             )
         };
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 622450ac4a..e239068d1d 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mania
 
         private class ManiaScrollSlider : OsuSliderBar<double>
         {
-            public override LocalisableString TooltipText => $"{(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value)} ({Current.Value}ms)";
+            public override LocalisableString TooltipText => $"{Current.Value}ms (speed {(int)Math.Round(DrawableManiaRuleset.MAX_TIME_RANGE / Current.Value)})";
         }
     }
 }

From 888d8b281747b7a34072cc270152aafbe21163d9 Mon Sep 17 00:00:00 2001
From: Josh <43808099+josh-codes@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:39:53 +0800
Subject: [PATCH 187/709] Removed redudent code & converted use of `OnDrag to
 `OnMouseMove`

---
 .../UI/CatchTouchInputMapper.cs               | 47 +++++++------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index bdbd958f6a..7886df69b6 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
 using osuTK.Graphics;
 using osuTK;
 using System.Collections.Generic;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -119,45 +120,29 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (getTouchCatchActionFromInput(e.ScreenSpaceMousePosition) == TouchCatchAction.None)
-                return false;
-
-            handleDown(e.Button, e.ScreenSpaceMousePosition);
-            return true;
+            return handleDown(e.Button, e.ScreenSpaceMousePosition);
         }
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (getTouchCatchActionFromInput(e.ScreenSpaceMousePosition) == TouchCatchAction.None)
-                return;
-
             handleUp(e.Button);
             base.OnMouseUp(e);
         }
 
-        protected override bool OnDragStart(DragStartEvent e)
+        protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            return true;
-        }
+            TouchCatchAction touchCatchAction = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
 
-        protected override void OnDrag(DragEvent e)
-        {
-            // I'm not sure if this is posible but let's be safe
-            if (!trackedActions.ContainsKey(e.Button))
-                trackedActions.Add(e.Button, TouchCatchAction.None);
+            // Loop through the buttons to avoid keeping a button pressed if both mouse buttons are pressed.
+            foreach (MouseButton i in e.PressedButtons)
+                trackedActions[i] = touchCatchAction;
 
-            trackedActions[e.Button] = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
             calculateActiveKeys();
-
-            base.OnDrag(e);
+            return true;
         }
 
         protected override void OnTouchMove(TouchMoveEvent e)
         {
-            // I'm not sure if this is posible but let's be safe
-            if (!trackedActions.ContainsKey(e.Touch.Source))
-                trackedActions.Add(e.Touch.Source, TouchCatchAction.None);
-
             trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
             calculateActiveKeys();
 
@@ -194,18 +179,20 @@ namespace osu.Game.Rulesets.Catch.UI
                 keyBindingContainer.TriggerReleased(CatchAction.Dash);
         }
 
-        private void handleDown(object source, Vector2 position)
+        private bool handleDown(object source, Vector2 position)
         {
-            Show();
-
             TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
 
-            // Not too sure how this can happen, but let's avoid throwing.
-            if (trackedActions.ContainsKey(source))
-                return;
+            if (catchAction == TouchCatchAction.None)
+                return false;
+
+            Show();
+
+            trackedActions[source] = catchAction;
 
-            trackedActions.Add(source, catchAction);
             calculateActiveKeys();
+
+            return true;
         }
 
         private void handleUp(object source)

From 45239fc737423f05f63c93b05e72ef20a33ef267 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Sep 2022 23:03:15 +0900
Subject: [PATCH 188/709] Update `TrueGameplayRate` accessing

---
 .../Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 82bf9cfa1e..04774b974f 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
             base.Update();
 
             double latestValidTime = clock.CurrentTime;
-            double earliestTimeValid = latestValidTime - 1000 * gameplayClock.TrueGameplayRate;
+            double earliestTimeValid = latestValidTime - 1000 * gameplayClock.GetTrueGameplayRate();
 
             int count = 0;
 

From 27aa3552dc03846cf7d23eb7b731b574be20e147 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 00:00:08 +0900
Subject: [PATCH 189/709] Update in line with `TrueGameplayRate` changes

---
 .../Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
index b740c06e03..2dad5e2c32 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecondCalculator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -107,7 +108,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool IsRunning => true;
 
-            public double TrueGameplayRate { get; set; } = 1;
+            public double TrueGameplayRate { set => adjustableAudioComponent.Tempo.Value = value; }
+
+            private readonly AudioAdjustments adjustableAudioComponent = new AudioAdjustments();
 
             public void ProcessFrame()
             {
@@ -117,6 +120,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             public double FramesPerSecond => throw new NotImplementedException();
             public FrameTimeInfo TimeInfo => throw new NotImplementedException();
             public double StartTime => throw new NotImplementedException();
+
+            public IAdjustableAudioComponent AdjustmentsFromMods => adjustableAudioComponent;
+
             public IEnumerable<double> NonGameplayAdjustments => throw new NotImplementedException();
             public IBindable<bool> IsPaused => throw new NotImplementedException();
         }

From d1e27e8a69d061492e7cf5c8223840de19d6de96 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 8 Sep 2022 23:14:34 +0800
Subject: [PATCH 190/709] add arrow short cut for skin editor

basically from `ComposeBlueprintContainer` because they have the same logic
---
 .../Skinning/Editor/SkinBlueprintContainer.cs | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 46f5c1e67f..5a1ef34151 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -11,9 +11,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -90,6 +93,47 @@ namespace osu.Game.Skinning.Editor
             base.AddBlueprintFor(item);
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            switch (e.Key)
+            {
+                case Key.Left:
+                    moveSelection(new Vector2(-1, 0));
+                    return true;
+
+                case Key.Right:
+                    moveSelection(new Vector2(1, 0));
+                    return true;
+
+                case Key.Up:
+                    moveSelection(new Vector2(0, -1));
+                    return true;
+
+                case Key.Down:
+                    moveSelection(new Vector2(0, 1));
+                    return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Move the current selection spatially by the specified delta, in screen coordinates (ie. the same coordinates as the blueprints).
+        /// </summary>
+        /// <param name="delta"></param>
+        private void moveSelection(Vector2 delta)
+        {
+            var firstBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault();
+
+            if (firstBlueprint == null)
+                return;
+
+            // convert to game space coordinates
+            delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
+
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<ISkinnableDrawable>(firstBlueprint, delta));
+        }
+
         protected override SelectionHandler<ISkinnableDrawable> CreateSelectionHandler() => new SkinSelectionHandler();
 
         protected override SelectionBlueprint<ISkinnableDrawable> CreateBlueprintFor(ISkinnableDrawable component)

From 2e775e688643176142460c5cc71aee748d7d1418 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Thu, 8 Sep 2022 23:47:55 +0800
Subject: [PATCH 191/709] Add test for object move

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index bd274dfef5..19d20dd552 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -22,7 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditor : PlayerTestScene
     {
-        private SkinEditor skinEditor;
+        private SkinEditor skinEditor = null!;
 
         protected override bool Autoplay => true;
 
@@ -54,7 +52,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestEditComponent()
         {
-            BarHitErrorMeter hitErrorMeter = null;
+            BarHitErrorMeter hitErrorMeter = null!;
 
             AddStep("select bar hit error blueprint", () =>
             {
@@ -65,6 +63,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 skinEditor.SelectedComponents.Add(blueprint.Item);
             });
 
+            AddStep("move by keyboard", () => InputManager.Key(Key.Right));
+
+            AddAssert("hitErrorMeter moved", () => hitErrorMeter.X != 0);
+
             AddAssert("value is default", () => hitErrorMeter.JudgementLineThickness.IsDefault);
 
             AddStep("hover first slider", () =>

From 38ccd06d5e650ae24507187e207871d476cdcf68 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Thu, 8 Sep 2022 20:42:55 +0200
Subject: [PATCH 192/709] Test fix

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index e3603ee90c..e2576e2577 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -147,6 +147,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestProcessingWhileHidden()
         {
+            const int max_displayed_judgements = 20;
             AddStep("OD 1", () => recreateDisplay(new OsuHitWindows(), 1));
 
             AddStep("hide displays", () =>
@@ -155,7 +156,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     hitErrorMeter.Hide();
             });
 
-            AddRepeatStep("hit", () => newJudgement(), 10);
+            AddRepeatStep("hit", () => newJudgement(), max_displayed_judgements * 2);
 
             AddAssert("bars added", () => this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddAssert("circle added", () => this.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Any());

From 28477f3b9763fe876030b24c03ea884c3bf35930 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Sep 2022 08:55:35 +0900
Subject: [PATCH 193/709] Fix inspection

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 19d20dd552..578718b7c9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditor : PlayerTestScene
     {
-        private SkinEditor skinEditor = null!;
+        private SkinEditor? skinEditor;
 
         protected override bool Autoplay => true;
 
@@ -40,13 +40,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Player.ScaleTo(0.4f);
                 LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
-            AddUntilStep("wait for loaded", () => skinEditor.IsLoaded);
+            AddUntilStep("wait for loaded", () => skinEditor!.IsLoaded);
         }
 
         [Test]
         public void TestToggleEditor()
         {
-            AddToggleStep("toggle editor visibility", _ => skinEditor.ToggleVisibility());
+            AddToggleStep("toggle editor visibility", _ => skinEditor!.ToggleVisibility());
         }
 
         [Test]
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 var blueprint = skinEditor.ChildrenOfType<SkinBlueprint>().First(b => b.Item is BarHitErrorMeter);
 
                 hitErrorMeter = (BarHitErrorMeter)blueprint.Item;
-                skinEditor.SelectedComponents.Clear();
+                skinEditor!.SelectedComponents.Clear();
                 skinEditor.SelectedComponents.Add(blueprint.Item);
             });
 

From 731d3f3b6358710943b1ed5230bedc3b7c9cfbcf Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 8 Sep 2022 22:06:44 +0900
Subject: [PATCH 194/709] Add MaximumStatistics upgrade for databased scores

---
 osu.Game/BackgroundBeatmapProcessor.cs | 55 ++++++++++++++++++-
 osu.Game/OsuGameBase.cs                |  2 +-
 osu.Game/Scoring/ScoreImporter.cs      | 73 +++++++++++++++++++++++++-
 osu.Game/Scoring/ScoreManager.cs       | 11 +++-
 4 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 14fdb2e1ef..405386660c 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -14,6 +15,7 @@ using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game
@@ -23,6 +25,9 @@ namespace osu.Game
         [Resolved]
         private RulesetStore rulesetStore { get; set; } = null!;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
         [Resolved]
         private RealmAccess realmAccess { get; set; } = null!;
 
@@ -41,11 +46,12 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 Logger.Log("Beginning background beatmap processing..");
                 checkForOutdatedStarRatings();
                 processBeatmapSetsWithMissingMetrics();
+                await processScoresWithMissingStatistics();
             }).ContinueWith(t =>
             {
                 if (t.Exception?.InnerException is ObjectDisposedException)
@@ -140,5 +146,52 @@ namespace osu.Game
                 });
             }
         }
+
+        private async Task processScoresWithMissingStatistics()
+        {
+            HashSet<Guid> scoreIds = new HashSet<Guid>();
+
+            Logger.Log("Querying for scores to reprocess...");
+
+            realmAccess.Run(r =>
+            {
+                foreach (var score in r.All<ScoreInfo>())
+                {
+                    if (score.Statistics.Sum(kvp => kvp.Value) > 0 && score.MaximumStatistics.Sum(kvp => kvp.Value) == 0)
+                        scoreIds.Add(score.ID);
+                }
+            });
+
+            Logger.Log($"Found {scoreIds.Count} scores which require reprocessing.");
+
+            foreach (var id in scoreIds)
+            {
+                while (localUserPlayInfo?.IsPlaying.Value == true)
+                {
+                    Logger.Log("Background processing sleeping due to active gameplay...");
+                    Thread.Sleep(TimeToSleepDuringGameplay);
+                }
+
+                try
+                {
+                    var score = scoreManager.Query(s => s.ID == id);
+
+                    await scoreManager.PopulateMaximumStatistics(score);
+
+                    // Can't use async overload because we're not on the update thread.
+                    // ReSharper disable once MethodHasAsyncOverload
+                    realmAccess.Write(r =>
+                    {
+                        r.Find<ScoreInfo>(id).MaximumStatisticsJson = JsonConvert.SerializeObject(score.MaximumStatistics);
+                    });
+
+                    Logger.Log($"Populated maximum statistics for score {id}");
+                }
+                catch (Exception e)
+                {
+                    Logger.Log(@$"Failed to populate maximum statistics for {id}: {e}");
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c95a281f09..c95dde8759 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -279,7 +279,7 @@ namespace osu.Game
             dependencies.Cache(difficultyCache = new BeatmapDifficultyCache());
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realm, API, LocalConfig));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realm, API, LocalConfig, difficultyCache));
 
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, realm, API, Audio, Resources, Host, defaultBeatmap, difficultyCache, performOnlineLookups: true));
 
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 45f827354e..488f5815f8 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -5,7 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
+using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -16,6 +18,8 @@ using osu.Game.Scoring.Legacy;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using Realms;
 
 namespace osu.Game.Scoring
@@ -28,15 +32,17 @@ namespace osu.Game.Scoring
 
         private readonly RulesetStore rulesets;
         private readonly Func<BeatmapManager> beatmaps;
+        private readonly BeatmapDifficultyCache? difficultyCache;
 
         private readonly IAPIProvider api;
 
-        public ScoreImporter(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api)
+        public ScoreImporter(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api, BeatmapDifficultyCache? difficultyCache = null)
             : base(storage, realm)
         {
             this.rulesets = rulesets;
             this.beatmaps = beatmaps;
             this.api = api;
+            this.difficultyCache = difficultyCache;
         }
 
         protected override ScoreInfo? CreateModel(ArchiveReader archive)
@@ -71,6 +77,8 @@ namespace osu.Game.Scoring
             if (model.BeatmapInfo == null) throw new ArgumentNullException(nameof(model.BeatmapInfo));
             if (model.Ruleset == null) throw new ArgumentNullException(nameof(model.Ruleset));
 
+            PopulateMaximumStatistics(model).WaitSafely();
+
             if (string.IsNullOrEmpty(model.StatisticsJson))
                 model.StatisticsJson = JsonConvert.SerializeObject(model.Statistics);
 
@@ -78,6 +86,69 @@ namespace osu.Game.Scoring
                 model.MaximumStatisticsJson = JsonConvert.SerializeObject(model.MaximumStatistics);
         }
 
+        /// <summary>
+        /// Populates the <see cref="ScoreInfo.MaximumStatistics"/> for a given <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The score to populate the statistics of.</param>
+        public async Task PopulateMaximumStatistics(ScoreInfo score)
+        {
+            if (score.MaximumStatistics.Select(kvp => kvp.Value).Sum() > 0)
+                return;
+
+            var beatmap = score.BeatmapInfo.Detach();
+            var ruleset = score.Ruleset.Detach();
+
+            // Populate the maximum statistics.
+            HitResult maxBasicResult = ruleset.CreateInstance().GetHitResults()
+                                              .Select(h => h.result)
+                                              .Where(h => h.IsBasic())
+                                              .OrderByDescending(Judgement.ToNumericResult).First();
+
+            foreach ((HitResult result, int count) in score.Statistics)
+            {
+                switch (result)
+                {
+                    case HitResult.LargeTickHit:
+                    case HitResult.LargeTickMiss:
+                        score.MaximumStatistics[HitResult.LargeTickHit] = score.MaximumStatistics.GetValueOrDefault(HitResult.LargeTickHit) + count;
+                        break;
+
+                    case HitResult.SmallTickHit:
+                    case HitResult.SmallTickMiss:
+                        score.MaximumStatistics[HitResult.SmallTickHit] = score.MaximumStatistics.GetValueOrDefault(HitResult.SmallTickHit) + count;
+                        break;
+
+                    case HitResult.IgnoreHit:
+                    case HitResult.IgnoreMiss:
+                    case HitResult.SmallBonus:
+                    case HitResult.LargeBonus:
+                        break;
+
+                    default:
+                        score.MaximumStatistics[maxBasicResult] = score.MaximumStatistics.GetValueOrDefault(maxBasicResult) + count;
+                        break;
+                }
+            }
+
+            if (!score.IsLegacyScore)
+                return;
+
+#pragma warning disable CS0618
+            if (difficultyCache == null)
+                throw new InvalidOperationException($"Cannot populate legacy score statistics without a {nameof(BeatmapDifficultyCache)}.");
+
+            // In osu! and osu!mania, some judgements affect combo but aren't stored to scores.
+            // A special hit result is used to pad out the combo value to match, based on the max combo from the difficulty attributes.
+            StarDifficulty? difficulty = await difficultyCache.GetDifficultyAsync(beatmap, ruleset, score.Mods);
+            if (difficulty == null)
+                throw new InvalidOperationException("Failed to populate maximum statistics due to missing difficulty attributes.");
+
+            int maxComboFromStatistics = score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Select(kvp => kvp.Value).DefaultIfEmpty(0).Sum();
+            if (difficulty.Value.MaxCombo > maxComboFromStatistics)
+                score.MaximumStatistics[HitResult.LegacyComboIncrease] = difficulty.Value.MaxCombo - maxComboFromStatistics;
+#pragma warning restore CS0618
+        }
+
         protected override void PostImport(ScoreInfo model, Realm realm, bool batchImport)
         {
             base.PostImport(model, realm, batchImport);
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 782590114f..87bb834a75 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -28,12 +28,13 @@ namespace osu.Game.Scoring
         private readonly OsuConfigManager configManager;
         private readonly ScoreImporter scoreImporter;
 
-        public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api, OsuConfigManager configManager = null)
+        public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api,
+                            OsuConfigManager configManager = null, BeatmapDifficultyCache difficultyCache = null)
             : base(storage, realm)
         {
             this.configManager = configManager;
 
-            scoreImporter = new ScoreImporter(rulesets, beatmaps, storage, realm, api)
+            scoreImporter = new ScoreImporter(rulesets, beatmaps, storage, realm, api, difficultyCache)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -178,6 +179,12 @@ namespace osu.Game.Scoring
         public Live<ScoreInfo> Import(ScoreInfo item, ArchiveReader archive = null, bool batchImport = false, CancellationToken cancellationToken = default) =>
             scoreImporter.ImportModel(item, archive, batchImport, cancellationToken);
 
+        /// <summary>
+        /// Populates the <see cref="ScoreInfo.MaximumStatistics"/> for a given <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The score to populate the statistics of.</param>
+        public Task PopulateMaximumStatistics(ScoreInfo score) => scoreImporter.PopulateMaximumStatistics(score);
+
         #region Implementation of IPresentImports<ScoreInfo>
 
         public Action<IEnumerable<Live<ScoreInfo>>> PresentImport

From 3b932b46ca8870c25e04a4fdcd1db3e792c18212 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Sep 2022 09:59:39 +0900
Subject: [PATCH 195/709] Fix entire TPL thread potentially being consumed
 during gameplay

---
 osu.Game/BackgroundBeatmapProcessor.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 405386660c..7a38abd071 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -50,7 +49,7 @@ namespace osu.Game
             {
                 Logger.Log("Beginning background beatmap processing..");
                 checkForOutdatedStarRatings();
-                processBeatmapSetsWithMissingMetrics();
+                await processBeatmapSetsWithMissingMetrics();
                 await processScoresWithMissingStatistics();
             }).ContinueWith(t =>
             {
@@ -100,7 +99,7 @@ namespace osu.Game
             }
         }
 
-        private void processBeatmapSetsWithMissingMetrics()
+        private async Task processBeatmapSetsWithMissingMetrics()
         {
             HashSet<Guid> beatmapSetIds = new HashSet<Guid>();
 
@@ -124,7 +123,7 @@ namespace osu.Game
                 while (localUserPlayInfo?.IsPlaying.Value == true)
                 {
                     Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
+                    await Task.Delay(TimeToSleepDuringGameplay);
                 }
 
                 realmAccess.Run(r =>
@@ -169,7 +168,7 @@ namespace osu.Game
                 while (localUserPlayInfo?.IsPlaying.Value == true)
                 {
                     Logger.Log("Background processing sleeping due to active gameplay...");
-                    Thread.Sleep(TimeToSleepDuringGameplay);
+                    await Task.Delay(TimeToSleepDuringGameplay);
                 }
 
                 try

From ba2ef424d4cac407692ad78c7c1c75b44110d419 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Sep 2022 11:30:36 +0900
Subject: [PATCH 196/709] Turn score ids into `ulong`s

---
 osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs | 2 +-
 osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index cfa9f77634..a0f76c4e14 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
-        private int onlineID = 1;
+        private ulong onlineID = 1;
 
         private APIScoresCollection createScores()
         {
diff --git a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
index d7b97cdddf..2c9f250028 100644
--- a/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+++ b/osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
@@ -81,12 +81,12 @@ namespace osu.Game.Online.API.Requests.Responses
         public int? LegacyTotalScore { get; set; }
 
         [JsonProperty("legacy_score_id")]
-        public uint? LegacyScoreId { get; set; }
+        public ulong? LegacyScoreId { get; set; }
 
         #region osu-web API additions (not stored to database).
 
         [JsonProperty("id")]
-        public long? ID { get; set; }
+        public ulong? ID { get; set; }
 
         [JsonProperty("user")]
         public APIUser? User { get; set; }
@@ -190,6 +190,6 @@ namespace osu.Game.Online.API.Requests.Responses
             MaximumStatistics = score.MaximumStatistics.Where(kvp => kvp.Value != 0).ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
         };
 
-        public long OnlineID => ID ?? -1;
+        public long OnlineID => (long?)ID ?? -1;
     }
 }

From 08d0c08750ae7341334a99aefa8920c9922f36f3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Sep 2022 13:57:01 +0900
Subject: [PATCH 197/709] Fix async exception by using difficulty calculator
 directly

---
 osu.Game/BackgroundBeatmapProcessor.cs |  2 +-
 osu.Game/OsuGameBase.cs                |  2 +-
 osu.Game/Scoring/ScoreImporter.cs      | 34 ++++++++++++--------------
 osu.Game/Scoring/ScoreManager.cs       |  6 ++---
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 7a38abd071..071862146f 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -175,7 +175,7 @@ namespace osu.Game
                 {
                     var score = scoreManager.Query(s => s.ID == id);
 
-                    await scoreManager.PopulateMaximumStatistics(score);
+                    scoreManager.PopulateMaximumStatistics(score);
 
                     // Can't use async overload because we're not on the update thread.
                     // ReSharper disable once MethodHasAsyncOverload
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c95dde8759..c95a281f09 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -279,7 +279,7 @@ namespace osu.Game
             dependencies.Cache(difficultyCache = new BeatmapDifficultyCache());
 
             // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
-            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realm, API, LocalConfig, difficultyCache));
+            dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, realm, API, LocalConfig));
 
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, realm, API, Audio, Resources, Host, defaultBeatmap, difficultyCache, performOnlineLookups: true));
 
diff --git a/osu.Game/Scoring/ScoreImporter.cs b/osu.Game/Scoring/ScoreImporter.cs
index 488f5815f8..5c8e21014c 100644
--- a/osu.Game/Scoring/ScoreImporter.cs
+++ b/osu.Game/Scoring/ScoreImporter.cs
@@ -3,11 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
-using osu.Framework.Extensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
@@ -32,17 +31,15 @@ namespace osu.Game.Scoring
 
         private readonly RulesetStore rulesets;
         private readonly Func<BeatmapManager> beatmaps;
-        private readonly BeatmapDifficultyCache? difficultyCache;
 
         private readonly IAPIProvider api;
 
-        public ScoreImporter(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api, BeatmapDifficultyCache? difficultyCache = null)
+        public ScoreImporter(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api)
             : base(storage, realm)
         {
             this.rulesets = rulesets;
             this.beatmaps = beatmaps;
             this.api = api;
-            this.difficultyCache = difficultyCache;
         }
 
         protected override ScoreInfo? CreateModel(ArchiveReader archive)
@@ -77,7 +74,7 @@ namespace osu.Game.Scoring
             if (model.BeatmapInfo == null) throw new ArgumentNullException(nameof(model.BeatmapInfo));
             if (model.Ruleset == null) throw new ArgumentNullException(nameof(model.Ruleset));
 
-            PopulateMaximumStatistics(model).WaitSafely();
+            PopulateMaximumStatistics(model);
 
             if (string.IsNullOrEmpty(model.StatisticsJson))
                 model.StatisticsJson = JsonConvert.SerializeObject(model.Statistics);
@@ -90,19 +87,22 @@ namespace osu.Game.Scoring
         /// Populates the <see cref="ScoreInfo.MaximumStatistics"/> for a given <see cref="ScoreInfo"/>.
         /// </summary>
         /// <param name="score">The score to populate the statistics of.</param>
-        public async Task PopulateMaximumStatistics(ScoreInfo score)
+        public void PopulateMaximumStatistics(ScoreInfo score)
         {
             if (score.MaximumStatistics.Select(kvp => kvp.Value).Sum() > 0)
                 return;
 
             var beatmap = score.BeatmapInfo.Detach();
             var ruleset = score.Ruleset.Detach();
+            var rulesetInstance = ruleset.CreateInstance();
+
+            Debug.Assert(rulesetInstance != null);
 
             // Populate the maximum statistics.
-            HitResult maxBasicResult = ruleset.CreateInstance().GetHitResults()
-                                              .Select(h => h.result)
-                                              .Where(h => h.IsBasic())
-                                              .OrderByDescending(Judgement.ToNumericResult).First();
+            HitResult maxBasicResult = rulesetInstance.GetHitResults()
+                                                      .Select(h => h.result)
+                                                      .Where(h => h.IsBasic())
+                                                      .OrderByDescending(Judgement.ToNumericResult).First();
 
             foreach ((HitResult result, int count) in score.Statistics)
             {
@@ -134,18 +134,14 @@ namespace osu.Game.Scoring
                 return;
 
 #pragma warning disable CS0618
-            if (difficultyCache == null)
-                throw new InvalidOperationException($"Cannot populate legacy score statistics without a {nameof(BeatmapDifficultyCache)}.");
-
             // In osu! and osu!mania, some judgements affect combo but aren't stored to scores.
             // A special hit result is used to pad out the combo value to match, based on the max combo from the difficulty attributes.
-            StarDifficulty? difficulty = await difficultyCache.GetDifficultyAsync(beatmap, ruleset, score.Mods);
-            if (difficulty == null)
-                throw new InvalidOperationException("Failed to populate maximum statistics due to missing difficulty attributes.");
+            var calculator = rulesetInstance.CreateDifficultyCalculator(beatmaps().GetWorkingBeatmap(beatmap));
+            var attributes = calculator.Calculate(score.Mods);
 
             int maxComboFromStatistics = score.MaximumStatistics.Where(kvp => kvp.Key.AffectsCombo()).Select(kvp => kvp.Value).DefaultIfEmpty(0).Sum();
-            if (difficulty.Value.MaxCombo > maxComboFromStatistics)
-                score.MaximumStatistics[HitResult.LegacyComboIncrease] = difficulty.Value.MaxCombo - maxComboFromStatistics;
+            if (attributes.MaxCombo > maxComboFromStatistics)
+                score.MaximumStatistics[HitResult.LegacyComboIncrease] = attributes.MaxCombo - maxComboFromStatistics;
 #pragma warning restore CS0618
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 87bb834a75..6bb31eb4db 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Scoring
         private readonly ScoreImporter scoreImporter;
 
         public ScoreManager(RulesetStore rulesets, Func<BeatmapManager> beatmaps, Storage storage, RealmAccess realm, IAPIProvider api,
-                            OsuConfigManager configManager = null, BeatmapDifficultyCache difficultyCache = null)
+                            OsuConfigManager configManager = null)
             : base(storage, realm)
         {
             this.configManager = configManager;
 
-            scoreImporter = new ScoreImporter(rulesets, beatmaps, storage, realm, api, difficultyCache)
+            scoreImporter = new ScoreImporter(rulesets, beatmaps, storage, realm, api)
             {
                 PostNotification = obj => PostNotification?.Invoke(obj)
             };
@@ -183,7 +183,7 @@ namespace osu.Game.Scoring
         /// Populates the <see cref="ScoreInfo.MaximumStatistics"/> for a given <see cref="ScoreInfo"/>.
         /// </summary>
         /// <param name="score">The score to populate the statistics of.</param>
-        public Task PopulateMaximumStatistics(ScoreInfo score) => scoreImporter.PopulateMaximumStatistics(score);
+        public void PopulateMaximumStatistics(ScoreInfo score) => scoreImporter.PopulateMaximumStatistics(score);
 
         #region Implementation of IPresentImports<ScoreInfo>
 

From 20ffbc4676a60e6c192131ce33678e2fdada6136 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 14:01:52 +0900
Subject: [PATCH 198/709] Fix beat sync stopping after returning to menu from a
 failed play

Closes #20193.

Explanation is inline comment.
---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 11 +++++++++++
 osu.Game/OsuGameBase.cs                 |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index a4787a34e8..3c528ba838 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -121,6 +121,17 @@ namespace osu.Game.Beatmaps
         protected override void Update()
         {
             base.Update();
+
+            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < finalClockSource.CurrentTime)
+            {
+                // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
+                // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93
+                // This is not always the case here when doing large seeks.
+                // (Of note, this is not an issue if the source is adjustable, as the source is seeked to be in time by DecoupleableInterpolatingFramedClock).
+                // Rather than trying to get around this by fixing the framework clock stack, let's work around it for now.
+                Seek(Source.CurrentTime);
+            }
+
             finalClockSource.ProcessFrame();
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index c95a281f09..97142d5472 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -390,11 +390,6 @@ namespace osu.Game
             var framedClock = new FramedClock(beatmap.Track);
 
             beatmapClock.ChangeSource(framedClock);
-
-            // Normally the internal decoupled clock will seek the *track* to the decoupled time, but we blocked this.
-            // It won't behave nicely unless we also set it to the track's time.
-            // Probably another thing which should be fixed in the decoupled mess (or just replaced).
-            beatmapClock.Seek(beatmap.Track.CurrentTime);
         }
 
         protected virtual void InitialiseFonts()

From 64cf6b9014aa0db328722e33e17f4b6ff2e64c98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 14:35:35 +0900
Subject: [PATCH 199/709] Compare with decoupled clock directly to avoid
 including offsets

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 3c528ba838..594663e7f2 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Beatmaps
         {
             base.Update();
 
-            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < finalClockSource.CurrentTime)
+            if (Source != null && Source is not IAdjustableClock && Source.CurrentTime < decoupledClock.CurrentTime)
             {
                 // InterpolatingFramedClock won't interpolate backwards unless its source has an ElapsedFrameTime.
                 // See https://github.com/ppy/osu-framework/blob/ba1385330cc501f34937e08257e586c84e35d772/osu.Framework/Timing/InterpolatingFramedClock.cs#L91-L93

From d6748d6921117a65846da635a45e0c6d04a5eef8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 14:35:47 +0900
Subject: [PATCH 200/709] Avoid double call to `ProcessFrame`

---
 osu.Game/Beatmaps/FramedBeatmapClock.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/FramedBeatmapClock.cs b/osu.Game/Beatmaps/FramedBeatmapClock.cs
index 594663e7f2..c7050cc50f 100644
--- a/osu.Game/Beatmaps/FramedBeatmapClock.cs
+++ b/osu.Game/Beatmaps/FramedBeatmapClock.cs
@@ -131,8 +131,8 @@ namespace osu.Game.Beatmaps
                 // Rather than trying to get around this by fixing the framework clock stack, let's work around it for now.
                 Seek(Source.CurrentTime);
             }
-
-            finalClockSource.ProcessFrame();
+            else
+                finalClockSource.ProcessFrame();
         }
 
         public double TotalAppliedOffset

From 856dbbba692a9d1ad31561a78a174c959a05a586 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 14:52:46 +0900
Subject: [PATCH 201/709] Fix attempting to use "home" key binding while
 exiting game causing errors

---
 osu.Game/OsuGame.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 108153fd9d..9e2384322a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -839,7 +839,9 @@ namespace osu.Game
                 OnHome = delegate
                 {
                     CloseAllOverlays(false);
-                    menuScreen?.MakeCurrent();
+
+                    if (menuScreen?.GetChildScreen() != null)
+                        menuScreen.MakeCurrent();
                 },
             }, topMostOverlayContent.Add);
 

From 2709a4d3984fffd805655ddc722bc72918c63875 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:04:25 +0900
Subject: [PATCH 202/709] Ensure overlay is always shown when movement is
 detected on mouse or keyboard

---
 osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 7886df69b6..1abca2ae98 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -131,6 +131,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
+            Show();
+
             TouchCatchAction touchCatchAction = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
 
             // Loop through the buttons to avoid keeping a button pressed if both mouse buttons are pressed.
@@ -143,6 +145,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override void OnTouchMove(TouchMoveEvent e)
         {
+            Show();
+
             trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
             calculateActiveKeys();
 
@@ -186,8 +190,6 @@ namespace osu.Game.Rulesets.Catch.UI
             if (catchAction == TouchCatchAction.None)
                 return false;
 
-            Show();
-
             trackedActions[source] = catchAction;
 
             calculateActiveKeys();

From 715e9018da3dd4d57084cbdc76c84100f712a3fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:11:26 +0900
Subject: [PATCH 203/709] Tidy up code and naming

---
 .../UI/CatchTouchInputMapper.cs               | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 1abca2ae98..c17946bdb1 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -19,16 +19,16 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchTouchInputMapper : VisibilityContainer
     {
-        private Dictionary<object, TouchCatchAction> trackedActions = new Dictionary<object, TouchCatchAction>();
+        private Dictionary<object, TouchCatchAction> trackedActionSources = new Dictionary<object, TouchCatchAction>();
 
         private KeyBindingContainer<CatchAction> keyBindingContainer = null!;
 
         private Container mainContent = null!;
 
-        private ArrowHitbox leftBox = null!;
-        private ArrowHitbox rightBox = null!;
-        private ArrowHitbox leftDashBox = null!;
-        private ArrowHitbox rightDashBox = null!;
+        private InputArea leftBox = null!;
+        private InputArea rightBox = null!;
+        private InputArea leftDashBox = null!;
+        private InputArea rightDashBox = null!;
 
         public override bool PropagatePositionalInputSubTree => true;
         public override bool PropagateNonPositionalInputSubTree => true;
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Catch.UI
                             Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
                             {
-                                leftBox = new ArrowHitbox(TouchCatchAction.MoveLeft, ref trackedActions, colours.Gray3)
+                                leftBox = new InputArea(TouchCatchAction.MoveLeft, ref trackedActionSources, colours.Gray3)
                                 {
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.UI
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 },
-                                leftDashBox = new ArrowHitbox(TouchCatchAction.DashLeft, ref trackedActions, colours.Gray2)
+                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, ref trackedActionSources, colours.Gray2)
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Catch.UI
                             Origin = Anchor.CentreRight,
                             Children = new Drawable[]
                             {
-                                rightBox = new ArrowHitbox(TouchCatchAction.MoveRight, ref trackedActions, colours.Gray3)
+                                rightBox = new InputArea(TouchCatchAction.MoveRight, ref trackedActionSources, colours.Gray3)
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Catch.UI
                                     RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 },
-                                rightDashBox = new ArrowHitbox(TouchCatchAction.DashRight, ref trackedActions, colours.Gray2)
+                                rightDashBox = new InputArea(TouchCatchAction.DashRight, ref trackedActionSources, colours.Gray2)
                                 {
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             // Loop through the buttons to avoid keeping a button pressed if both mouse buttons are pressed.
             foreach (MouseButton i in e.PressedButtons)
-                trackedActions[i] = touchCatchAction;
+                trackedActionSources[i] = touchCatchAction;
 
             calculateActiveKeys();
             return true;
@@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             Show();
 
-            trackedActions[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
+            trackedActionSources[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
             calculateActiveKeys();
 
             base.OnTouchMove(e);
@@ -165,24 +165,6 @@ namespace osu.Game.Rulesets.Catch.UI
             base.OnTouchUp(e);
         }
 
-        private void calculateActiveKeys()
-        {
-            if (trackedActions.ContainsValue(TouchCatchAction.DashLeft) || trackedActions.ContainsValue(TouchCatchAction.MoveLeft))
-                keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.MoveLeft);
-
-            if (trackedActions.ContainsValue(TouchCatchAction.DashRight) || trackedActions.ContainsValue(TouchCatchAction.MoveRight))
-                keyBindingContainer.TriggerPressed(CatchAction.MoveRight);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.MoveRight);
-
-            if (trackedActions.ContainsValue(TouchCatchAction.DashRight) || trackedActions.ContainsValue(TouchCatchAction.DashLeft))
-                keyBindingContainer.TriggerPressed(CatchAction.Dash);
-            else
-                keyBindingContainer.TriggerReleased(CatchAction.Dash);
-        }
-
         private bool handleDown(object source, Vector2 position)
         {
             TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
@@ -190,7 +172,7 @@ namespace osu.Game.Rulesets.Catch.UI
             if (catchAction == TouchCatchAction.None)
                 return false;
 
-            trackedActions[source] = catchAction;
+            trackedActionSources[source] = catchAction;
 
             calculateActiveKeys();
 
@@ -199,11 +181,29 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void handleUp(object source)
         {
-            trackedActions.Remove(source);
+            trackedActionSources.Remove(source);
 
             calculateActiveKeys();
         }
 
+        private void calculateActiveKeys()
+        {
+            if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft))
+                keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.MoveLeft);
+
+            if (trackedActionSources.ContainsValue(TouchCatchAction.DashRight) || trackedActionSources.ContainsValue(TouchCatchAction.MoveRight))
+                keyBindingContainer.TriggerPressed(CatchAction.MoveRight);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.MoveRight);
+
+            if (trackedActionSources.ContainsValue(TouchCatchAction.DashRight) || trackedActionSources.ContainsValue(TouchCatchAction.DashLeft))
+                keyBindingContainer.TriggerPressed(CatchAction.Dash);
+            else
+                keyBindingContainer.TriggerReleased(CatchAction.Dash);
+        }
+
         private TouchCatchAction getTouchCatchActionFromInput(Vector2 inputPosition)
         {
             if (leftDashBox.Contains(inputPosition))
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Catch.UI
             mainContent.FadeOut(300);
         }
 
-        private class ArrowHitbox : CompositeDrawable, IKeyBindingHandler<CatchAction>
+        private class InputArea : CompositeDrawable, IKeyBindingHandler<CatchAction>
         {
             private readonly TouchCatchAction handledAction;
 
@@ -238,7 +238,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private bool isHiglighted;
 
-            public ArrowHitbox(TouchCatchAction handledAction, ref Dictionary<object, TouchCatchAction> trackedActions, Color4 colour)
+            public InputArea(TouchCatchAction handledAction, ref Dictionary<object, TouchCatchAction> trackedActions, Color4 colour)
             {
                 this.handledAction = handledAction;
                 this.trackedActions = trackedActions;

From a42c1af09ea2571d20afeb5435e4388af4225c68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:19:30 +0900
Subject: [PATCH 204/709] Tidy up highlighting code and ensure read-only access
 to dictionary by highlight areas

---
 .../UI/CatchTouchInputMapper.cs               | 90 ++++++++-----------
 1 file changed, 35 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index c17946bdb1..58cda7fef4 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -1,8 +1,9 @@
 // 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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
-using System.Diagnostics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,16 +11,18 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osuTK.Graphics;
 using osuTK;
-using System.Collections.Generic;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatchTouchInputMapper : VisibilityContainer
     {
-        private Dictionary<object, TouchCatchAction> trackedActionSources = new Dictionary<object, TouchCatchAction>();
+        public override bool PropagatePositionalInputSubTree => true;
+        public override bool PropagateNonPositionalInputSubTree => true;
+
+        private readonly Dictionary<object, TouchCatchAction> trackedActionSources = new Dictionary<object, TouchCatchAction>();
 
         private KeyBindingContainer<CatchAction> keyBindingContainer = null!;
 
@@ -30,17 +33,11 @@ namespace osu.Game.Rulesets.Catch.UI
         private InputArea leftDashBox = null!;
         private InputArea rightDashBox = null!;
 
-        public override bool PropagatePositionalInputSubTree => true;
-        public override bool PropagateNonPositionalInputSubTree => true;
-
         [BackgroundDependencyLoader]
         private void load(CatchInputManager catchInputManager, OsuColour colours)
         {
-            Debug.Assert(catchInputManager.KeyBindingContainer != null);
-
             keyBindingContainer = catchInputManager.KeyBindingContainer;
 
-            // Container should handle input everywhere.
             RelativeSizeAxes = Axes.Both;
 
             Children = new Drawable[]
@@ -48,7 +45,6 @@ namespace osu.Game.Rulesets.Catch.UI
                 mainContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    RelativePositionAxes = Axes.Both,
                     Alpha = 0,
                     Children = new Drawable[]
                     {
@@ -56,25 +52,18 @@ namespace osu.Game.Rulesets.Catch.UI
                         {
                             RelativeSizeAxes = Axes.Both,
                             Width = 0.15f,
-                            Height = 1,
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
                             {
-                                leftBox = new InputArea(TouchCatchAction.MoveLeft, ref trackedActionSources, colours.Gray3)
+                                leftBox = new InputArea(TouchCatchAction.MoveLeft, trackedActionSources, colours.Gray3)
                                 {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
                                     RelativeSizeAxes = Axes.Both,
-                                    RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
                                 },
-                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, ref trackedActionSources, colours.Gray2)
+                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, trackedActionSources, colours.Gray2)
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
                                     RelativeSizeAxes = Axes.Both,
-                                    RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 }
                             }
@@ -83,26 +72,21 @@ namespace osu.Game.Rulesets.Catch.UI
                         {
                             RelativeSizeAxes = Axes.Both,
                             Width = 0.15f,
-                            Height = 1,
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
                             Children = new Drawable[]
                             {
-                                rightBox = new InputArea(TouchCatchAction.MoveRight, ref trackedActionSources, colours.Gray3)
+                                rightBox = new InputArea(TouchCatchAction.MoveRight, trackedActionSources, colours.Gray3)
                                 {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
                                     RelativeSizeAxes = Axes.Both,
-                                    RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
                                 },
-                                rightDashBox = new InputArea(TouchCatchAction.DashRight, ref trackedActionSources, colours.Gray2)
+                                rightDashBox = new InputArea(TouchCatchAction.DashRight, trackedActionSources, colours.Gray2)
                                 {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
                                     RelativeSizeAxes = Axes.Both,
-                                    RelativePositionAxes = Axes.Both,
                                     Width = 0.5f,
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
                                 },
                             }
                         },
@@ -218,15 +202,9 @@ namespace osu.Game.Rulesets.Catch.UI
             return TouchCatchAction.None;
         }
 
-        protected override void PopIn()
-        {
-            mainContent.FadeIn(500, Easing.OutQuint);
-        }
+        protected override void PopIn() => mainContent.FadeIn(500, Easing.OutQuint);
 
-        protected override void PopOut()
-        {
-            mainContent.FadeOut(300);
-        }
+        protected override void PopOut() => mainContent.FadeOut(300);
 
         private class InputArea : CompositeDrawable, IKeyBindingHandler<CatchAction>
         {
@@ -234,11 +212,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private readonly Box overlay;
 
-            private readonly Dictionary<object, TouchCatchAction> trackedActions;
+            private readonly IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions;
 
-            private bool isHiglighted;
+            private bool isHighlighted;
 
-            public InputArea(TouchCatchAction handledAction, ref Dictionary<object, TouchCatchAction> trackedActions, Color4 colour)
+            public InputArea(TouchCatchAction handledAction, IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions, Color4 colour)
             {
                 this.handledAction = handledAction;
                 this.trackedActions = trackedActions;
@@ -273,22 +251,24 @@ namespace osu.Game.Rulesets.Catch.UI
 
             public bool OnPressed(KeyBindingPressEvent<CatchAction> _)
             {
-                if (trackedActions.ContainsValue(handledAction))
-                {
-                    isHiglighted = true;
-                    overlay.FadeTo(0.5f, 80, Easing.OutQuint);
-                }
-
+                updateHighlight();
                 return false;
             }
 
             public void OnReleased(KeyBindingReleaseEvent<CatchAction> _)
             {
-                if (isHiglighted && !trackedActions.ContainsValue(handledAction))
-                {
-                    isHiglighted = false;
-                    overlay.FadeOut(1000, Easing.Out);
-                }
+                updateHighlight();
+            }
+
+            private void updateHighlight()
+            {
+                bool isHandling = trackedActions.Any(a => a.Value == handledAction);
+
+                if (isHandling == isHighlighted)
+                    return;
+
+                isHighlighted = isHandling;
+                overlay.FadeTo(isHighlighted ? 0.5f : 0, isHighlighted ? 80 : 400, Easing.OutQuint);
             }
         }
 

From 5852a09003fdd41c065f93e64b8d412cf6bfcee0 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Fri, 9 Sep 2022 08:21:33 +0200
Subject: [PATCH 205/709] small fix

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index e2576e2577..7c668adba5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("ensure max circles not exceeded", () =>
             {
                 return this.ChildrenOfType<ColourHitErrorMeter>()
-                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= 10);
+                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= max_displayed_judgements);
             });
 
             AddStep("show displays", () =>

From e6ba95ee16e7595f748f2ee39a94289918a47327 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:22:12 +0900
Subject: [PATCH 206/709] Don't bother calculating active keys if input source
 was not handled

---
 osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 58cda7fef4..847814c0ea 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -149,15 +150,14 @@ namespace osu.Game.Rulesets.Catch.UI
             base.OnTouchUp(e);
         }
 
-        private bool handleDown(object source, Vector2 position)
+        private bool handleDown(object inputSource, Vector2 position)
         {
             TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
 
             if (catchAction == TouchCatchAction.None)
                 return false;
 
-            trackedActionSources[source] = catchAction;
-
+            trackedActionSources[inputSource] = catchAction;
             calculateActiveKeys();
 
             return true;
@@ -165,9 +165,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void handleUp(object source)
         {
-            trackedActionSources.Remove(source);
-
-            calculateActiveKeys();
+            if (trackedActionSources.Remove(source))
+                calculateActiveKeys();
         }
 
         private void calculateActiveKeys()

From ba951b76f73b16c6ea7b1305a78697bea90a6fc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:28:40 +0900
Subject: [PATCH 207/709] Unify and simplify input handling code

---
 .../UI/CatchTouchInputMapper.cs               | 63 +++++++++----------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 847814c0ea..3d634c4e00 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -108,40 +107,30 @@ namespace osu.Game.Rulesets.Catch.UI
             return handleDown(e.Button, e.ScreenSpaceMousePosition);
         }
 
-        protected override void OnMouseUp(MouseUpEvent e)
+        protected override bool OnTouchDown(TouchDownEvent e)
         {
-            handleUp(e.Button);
-            base.OnMouseUp(e);
+            handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position);
+            return true;
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            Show();
-
-            TouchCatchAction touchCatchAction = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
-
-            // Loop through the buttons to avoid keeping a button pressed if both mouse buttons are pressed.
-            foreach (MouseButton i in e.PressedButtons)
-                trackedActionSources[i] = touchCatchAction;
-
-            calculateActiveKeys();
+            // multiple mouse buttons may be pressed and handling the same action.
+            foreach (MouseButton button in e.PressedButtons)
+                handleMove(button, e.ScreenSpaceMousePosition);
             return true;
         }
 
         protected override void OnTouchMove(TouchMoveEvent e)
         {
-            Show();
-
-            trackedActionSources[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
-            calculateActiveKeys();
-
+            handleMove(e.Touch.Source, e.ScreenSpaceTouch.Position);
             base.OnTouchMove(e);
         }
 
-        protected override bool OnTouchDown(TouchDownEvent e)
+        protected override void OnMouseUp(MouseUpEvent e)
         {
-            handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position);
-            return true;
+            handleUp(e.Button);
+            base.OnMouseUp(e);
         }
 
         protected override void OnTouchUp(TouchUpEvent e)
@@ -150,15 +139,23 @@ namespace osu.Game.Rulesets.Catch.UI
             base.OnTouchUp(e);
         }
 
-        private bool handleDown(object inputSource, Vector2 position)
+        private void handleMove(object inputSource, Vector2 screenSpaceInputPosition)
         {
-            TouchCatchAction catchAction = getTouchCatchActionFromInput(position);
+            Show();
 
-            if (catchAction == TouchCatchAction.None)
+            trackedActionSources[inputSource] = getTouchCatchActionFromInput(screenSpaceInputPosition);
+            updatePressedActions();
+        }
+
+        private bool handleDown(object inputSource, Vector2 screenSpaceInputPosition)
+        {
+            TouchCatchAction action = getTouchCatchActionFromInput(screenSpaceInputPosition);
+
+            if (action == TouchCatchAction.None)
                 return false;
 
-            trackedActionSources[inputSource] = catchAction;
-            calculateActiveKeys();
+            trackedActionSources[inputSource] = action;
+            updatePressedActions();
 
             return true;
         }
@@ -166,10 +163,10 @@ namespace osu.Game.Rulesets.Catch.UI
         private void handleUp(object source)
         {
             if (trackedActionSources.Remove(source))
-                calculateActiveKeys();
+                updatePressedActions();
         }
 
-        private void calculateActiveKeys()
+        private void updatePressedActions()
         {
             if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft))
                 keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
@@ -187,15 +184,15 @@ namespace osu.Game.Rulesets.Catch.UI
                 keyBindingContainer.TriggerReleased(CatchAction.Dash);
         }
 
-        private TouchCatchAction getTouchCatchActionFromInput(Vector2 inputPosition)
+        private TouchCatchAction getTouchCatchActionFromInput(Vector2 screenSpaceInputPosition)
         {
-            if (leftDashBox.Contains(inputPosition))
+            if (leftDashBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.DashLeft;
-            if (rightDashBox.Contains(inputPosition))
+            if (rightDashBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.DashRight;
-            if (leftBox.Contains(inputPosition))
+            if (leftBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.MoveLeft;
-            if (rightBox.Contains(inputPosition))
+            if (rightBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.MoveRight;
 
             return TouchCatchAction.None;

From 64eaf461ac9ce39a9f13ae082b4f56eaacf83a49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 15:58:43 +0900
Subject: [PATCH 208/709] Simplify input handling even further

---
 .../UI/CatchTouchInputMapper.cs               | 97 +++++++++----------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 3d634c4e00..13333ecc61 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -36,6 +35,8 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load(CatchInputManager catchInputManager, OsuColour colours)
         {
+            const float width = 0.15f;
+
             keyBindingContainer = catchInputManager.KeyBindingContainer;
 
             RelativeSizeAxes = Axes.Both;
@@ -51,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.UI
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Width = 0.15f,
+                            Width = width,
                             Children = new Drawable[]
                             {
                                 leftBox = new InputArea(TouchCatchAction.MoveLeft, trackedActionSources, colours.Gray3)
@@ -71,7 +72,7 @@ namespace osu.Game.Rulesets.Catch.UI
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Width = 0.15f,
+                            Width = width,
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight,
                             Children = new Drawable[]
@@ -104,70 +105,69 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            return handleDown(e.Button, e.ScreenSpaceMousePosition);
+            return updateAction(e.Button, getTouchCatchActionFromInput(e.ScreenSpaceMousePosition));
         }
 
         protected override bool OnTouchDown(TouchDownEvent e)
         {
-            handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position);
-            return true;
+            return updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
+            Show();
+
+            TouchCatchAction? action = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition);
+
             // multiple mouse buttons may be pressed and handling the same action.
             foreach (MouseButton button in e.PressedButtons)
-                handleMove(button, e.ScreenSpaceMousePosition);
-            return true;
+                updateAction(button, action);
+
+            return false;
         }
 
         protected override void OnTouchMove(TouchMoveEvent e)
         {
-            handleMove(e.Touch.Source, e.ScreenSpaceTouch.Position);
+            updateAction(e.Touch.Source, getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position));
             base.OnTouchMove(e);
         }
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            handleUp(e.Button);
+            updateAction(e.Button, null);
             base.OnMouseUp(e);
         }
 
         protected override void OnTouchUp(TouchUpEvent e)
         {
-            handleUp(e.Touch.Source);
+            updateAction(e.Touch.Source, null);
             base.OnTouchUp(e);
         }
 
-        private void handleMove(object inputSource, Vector2 screenSpaceInputPosition)
+        private bool updateAction(object source, TouchCatchAction? newAction)
         {
-            Show();
+            TouchCatchAction? actionBefore = null;
 
-            trackedActionSources[inputSource] = getTouchCatchActionFromInput(screenSpaceInputPosition);
-            updatePressedActions();
-        }
+            if (trackedActionSources.TryGetValue(source, out TouchCatchAction found))
+                actionBefore = found;
 
-        private bool handleDown(object inputSource, Vector2 screenSpaceInputPosition)
-        {
-            TouchCatchAction action = getTouchCatchActionFromInput(screenSpaceInputPosition);
+            if (actionBefore != newAction)
+            {
+                if (newAction != null)
+                    trackedActionSources[source] = newAction.Value;
+                else
+                    trackedActionSources.Remove(source);
 
-            if (action == TouchCatchAction.None)
-                return false;
-
-            trackedActionSources[inputSource] = action;
-            updatePressedActions();
-
-            return true;
-        }
-
-        private void handleUp(object source)
-        {
-            if (trackedActionSources.Remove(source))
                 updatePressedActions();
+            }
+
+            return newAction != null;
         }
 
         private void updatePressedActions()
         {
+            Show();
+
             if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft))
                 keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
             else
@@ -178,13 +178,13 @@ namespace osu.Game.Rulesets.Catch.UI
             else
                 keyBindingContainer.TriggerReleased(CatchAction.MoveRight);
 
-            if (trackedActionSources.ContainsValue(TouchCatchAction.DashRight) || trackedActionSources.ContainsValue(TouchCatchAction.DashLeft))
+            if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.DashRight))
                 keyBindingContainer.TriggerPressed(CatchAction.Dash);
             else
                 keyBindingContainer.TriggerReleased(CatchAction.Dash);
         }
 
-        private TouchCatchAction getTouchCatchActionFromInput(Vector2 screenSpaceInputPosition)
+        private TouchCatchAction? getTouchCatchActionFromInput(Vector2 screenSpaceInputPosition)
         {
             if (leftDashBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.DashLeft;
@@ -195,18 +195,18 @@ namespace osu.Game.Rulesets.Catch.UI
             if (rightBox.Contains(screenSpaceInputPosition))
                 return TouchCatchAction.MoveRight;
 
-            return TouchCatchAction.None;
+            return null;
         }
 
-        protected override void PopIn() => mainContent.FadeIn(500, Easing.OutQuint);
+        protected override void PopIn() => mainContent.FadeIn(300, Easing.OutQuint);
 
-        protected override void PopOut() => mainContent.FadeOut(300);
+        protected override void PopOut() => mainContent.FadeOut(300, Easing.OutQuint);
 
         private class InputArea : CompositeDrawable, IKeyBindingHandler<CatchAction>
         {
             private readonly TouchCatchAction handledAction;
 
-            private readonly Box overlay;
+            private readonly Box highlightOverlay;
 
             private readonly IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions;
 
@@ -221,24 +221,20 @@ namespace osu.Game.Rulesets.Catch.UI
                 {
                     new Container
                     {
-                        Width = 1,
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
                             new Box
                             {
+                                RelativeSizeAxes = Axes.Both,
                                 Alpha = 0.8f,
                                 Colour = colour,
-                                Width = 1,
-                                RelativeSizeAxes = Axes.Both,
                             },
-                            overlay = new Box
+                            highlightOverlay = new Box
                             {
-                                Alpha = 0,
-                                Colour = colour.Multiply(1.4f),
-                                Blending = BlendingParameters.Additive,
-                                Width = 1,
                                 RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                Blending = BlendingParameters.Additive,
                             }
                         }
                     }
@@ -264,17 +260,16 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
 
                 isHighlighted = isHandling;
-                overlay.FadeTo(isHighlighted ? 0.5f : 0, isHighlighted ? 80 : 400, Easing.OutQuint);
+                highlightOverlay.FadeTo(isHighlighted ? 0.1f : 0, isHighlighted ? 80 : 400, Easing.OutQuint);
             }
         }
 
         public enum TouchCatchAction
         {
-            MoveLeft = 0,
-            MoveRight = 1,
-            DashLeft = 2,
-            DashRight = 3,
-            None = 4
+            MoveLeft,
+            MoveRight,
+            DashLeft,
+            DashRight,
         }
     }
 }

From f3fc8af6ee9fde39b0b4c644c2bc702ae0242107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 16:03:36 +0900
Subject: [PATCH 209/709] Adjust visuals

---
 .../UI/CatchTouchInputMapper.cs               | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index 13333ecc61..cdb587ad64 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -11,7 +11,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.UI
@@ -55,18 +54,19 @@ namespace osu.Game.Rulesets.Catch.UI
                             Width = width,
                             Children = new Drawable[]
                             {
-                                leftBox = new InputArea(TouchCatchAction.MoveLeft, trackedActionSources, colours.Gray3)
+                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, trackedActionSources)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.5f,
+                                },
+                                leftBox = new InputArea(TouchCatchAction.MoveLeft, trackedActionSources)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Width = 0.5f,
+                                    Colour = colours.GrayC,
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                 },
-                                leftDashBox = new InputArea(TouchCatchAction.DashLeft, trackedActionSources, colours.Gray2)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Width = 0.5f,
-                                }
                             }
                         },
                         new Container
@@ -77,12 +77,13 @@ namespace osu.Game.Rulesets.Catch.UI
                             Origin = Anchor.TopRight,
                             Children = new Drawable[]
                             {
-                                rightBox = new InputArea(TouchCatchAction.MoveRight, trackedActionSources, colours.Gray3)
+                                rightBox = new InputArea(TouchCatchAction.MoveRight, trackedActionSources)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.5f,
+                                    Colour = colours.GrayC,
                                 },
-                                rightDashBox = new InputArea(TouchCatchAction.DashRight, trackedActionSources, colours.Gray2)
+                                rightDashBox = new InputArea(TouchCatchAction.DashRight, trackedActionSources)
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.5f,
@@ -212,7 +213,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private bool isHighlighted;
 
-            public InputArea(TouchCatchAction handledAction, IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions, Color4 colour)
+            public InputArea(TouchCatchAction handledAction, IEnumerable<KeyValuePair<object, TouchCatchAction>> trackedActions)
             {
                 this.handledAction = handledAction;
                 this.trackedActions = trackedActions;
@@ -227,8 +228,8 @@ namespace osu.Game.Rulesets.Catch.UI
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.8f,
-                                Colour = colour,
+                                Alpha = 0.2f,
+                                Colour = OsuColour.Gray(0.8f),
                             },
                             highlightOverlay = new Box
                             {

From 280b1dd48406d2af07be856e8abc1cdae097d18f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 9 Sep 2022 16:12:18 +0900
Subject: [PATCH 210/709] Revert async Task change

---
 osu.Game/BackgroundBeatmapProcessor.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/BackgroundBeatmapProcessor.cs b/osu.Game/BackgroundBeatmapProcessor.cs
index 071862146f..ea5904a8d3 100644
--- a/osu.Game/BackgroundBeatmapProcessor.cs
+++ b/osu.Game/BackgroundBeatmapProcessor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -45,12 +46,12 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            Task.Run(async () =>
+            Task.Run(() =>
             {
                 Logger.Log("Beginning background beatmap processing..");
                 checkForOutdatedStarRatings();
-                await processBeatmapSetsWithMissingMetrics();
-                await processScoresWithMissingStatistics();
+                processBeatmapSetsWithMissingMetrics();
+                processScoresWithMissingStatistics();
             }).ContinueWith(t =>
             {
                 if (t.Exception?.InnerException is ObjectDisposedException)
@@ -99,7 +100,7 @@ namespace osu.Game
             }
         }
 
-        private async Task processBeatmapSetsWithMissingMetrics()
+        private void processBeatmapSetsWithMissingMetrics()
         {
             HashSet<Guid> beatmapSetIds = new HashSet<Guid>();
 
@@ -123,7 +124,7 @@ namespace osu.Game
                 while (localUserPlayInfo?.IsPlaying.Value == true)
                 {
                     Logger.Log("Background processing sleeping due to active gameplay...");
-                    await Task.Delay(TimeToSleepDuringGameplay);
+                    Thread.Sleep(TimeToSleepDuringGameplay);
                 }
 
                 realmAccess.Run(r =>
@@ -146,7 +147,7 @@ namespace osu.Game
             }
         }
 
-        private async Task processScoresWithMissingStatistics()
+        private void processScoresWithMissingStatistics()
         {
             HashSet<Guid> scoreIds = new HashSet<Guid>();
 
@@ -168,7 +169,7 @@ namespace osu.Game
                 while (localUserPlayInfo?.IsPlaying.Value == true)
                 {
                     Logger.Log("Background processing sleeping due to active gameplay...");
-                    await Task.Delay(TimeToSleepDuringGameplay);
+                    Thread.Sleep(TimeToSleepDuringGameplay);
                 }
 
                 try

From bffc9555bfcf5861ea9bc566f0d76876eef0ef5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 16:12:54 +0900
Subject: [PATCH 211/709] Adjust visuals slightly further (and remove
 double-gray application)

---
 .../TestSceneCatchTouchInput.cs                          | 2 +-
 osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
index b510a69f14..cbf6e8f202 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [Test]
-        public void TestInputField()
+        public void TestBasic()
         {
             AddStep("show overlay", () => catchTouchInputMapper.Show());
         }
diff --git a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
index cdb587ad64..e6736d6c93 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Catch.UI
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.5f,
-                                    Colour = colours.GrayC,
+                                    Colour = colours.Gray9,
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                 },
@@ -81,7 +81,7 @@ namespace osu.Game.Rulesets.Catch.UI
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.5f,
-                                    Colour = colours.GrayC,
+                                    Colour = colours.Gray9,
                                 },
                                 rightDashBox = new InputArea(TouchCatchAction.DashRight, trackedActionSources)
                                 {
@@ -223,13 +223,14 @@ namespace osu.Game.Rulesets.Catch.UI
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        CornerRadius = 10,
                         Children = new Drawable[]
                         {
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.2f,
-                                Colour = OsuColour.Gray(0.8f),
+                                Alpha = 0.15f,
                             },
                             highlightOverlay = new Box
                             {

From 05797cb9e55447823b72c4a56e61a4d152472284 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 16:30:08 +0900
Subject: [PATCH 212/709] Fix enum to STRING????????? conversion (and use
 bindable flow)

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 81 +++++++++----------
 1 file changed, 36 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 0713469e10..c218ff11e9 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -1,7 +1,6 @@
 // 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 osu.Framework.Bindables;
@@ -78,11 +77,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 judgementsFlow.Clear();
                 judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
             }, true);
-            HitShape.BindValueChanged(_ =>
-            {
-                judgementsFlow.Shape = getShapeStyle(HitShape.Value);
-                judgementsFlow.Clear();
-            }, true);
         }
 
         public override void Clear() => judgementsFlow.Clear();
@@ -90,7 +84,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private class JudgementFlow : FillFlowContainer<HitErrorShape>
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
-            internal string Shape = null!;
+
+            public readonly Bindable<ShapeStyle> Shape = new Bindable<ShapeStyle>();
 
             public JudgementFlow()
             {
@@ -102,7 +97,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             public void Push(Color4 colour, int maxErrorShapeCount)
             {
-                Add(new HitErrorShape(colour, drawable_judgement_size, Shape));
+                Add(new HitErrorShape(colour, drawable_judgement_size)
+                {
+                    Shape = { BindTarget = Shape },
+                });
 
                 if (Children.Count > maxErrorShapeCount)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
@@ -113,36 +111,44 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             public bool IsRemoved { get; private set; }
 
-            public HitErrorShape(Color4 colour, int size, string shape)
+            public readonly Bindable<ShapeStyle> Shape = new Bindable<ShapeStyle>();
+
+            private readonly Color4 colour;
+
+            public HitErrorShape(Color4 colour, int size)
             {
+                this.colour = colour;
                 Size = new Vector2(size);
-
-                switch (shape)
-                {
-                    case "circle":
-                        Child = new Circle
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            Colour = colour
-                        };
-                        break;
-
-                    case "square":
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            Colour = colour
-                        };
-                        break;
-                }
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
+                Shape.BindValueChanged(shape =>
+                {
+                    switch (shape.NewValue)
+                    {
+                        case ShapeStyle.Circle:
+                            Child = new Circle
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                Colour = colour
+                            };
+                            break;
+
+                        case ShapeStyle.Square:
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                Colour = colour
+                            };
+                            break;
+                    }
+                }, true);
+
                 Child.FadeInFromZero(animation_duration, Easing.OutQuint);
                 Child.MoveToY(-DrawSize.Y);
                 Child.MoveToY(0, animation_duration, Easing.OutQuint);
@@ -156,21 +162,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }
         }
 
-        private string getShapeStyle(ShapeStyle shape)
-        {
-            switch (shape)
-            {
-                case ShapeStyle.Circle:
-                    return "circle";
-
-                case ShapeStyle.Square:
-                    return "square";
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(shape), shape, @"Unsupported animation style");
-            }
-        }
-
         public enum ShapeStyle
         {
             Circle,

From ec21ab8171c7b2a346e1f11e4550b5c6896506e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 16:39:22 +0900
Subject: [PATCH 213/709] Reduce ramp mod multipliers in line with other
 difficulty change mods for now

Closes https://github.com/ppy/osu/issues/20204.

Will require reprocessing of everything server-side.
---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 2 ++
 osu.Game/Rulesets/Mods/ModWindDown.cs | 1 -
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7031489d0e..72a7f4b9a3 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         public const double FINAL_RATE_PROGRESS = 0.75f;
 
+        public override double ScoreMultiplier => 0.5;
+
         [SettingSource("Initial rate", "The starting speed of the track")]
         public abstract BindableNumber<double> InitialRate { get; }
 
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index e84bdab69c..22ed7c2efd 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override string Acronym => "WD";
         public override LocalisableString Description => "Sloooow doooown...";
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
-        public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 39cee50f96..13ece6d9a3 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override string Acronym => "WU";
         public override LocalisableString Description => "Can you keep up?";
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
-        public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble

From 648c6245bbe72f1625dcecdb35875580d5f76a93 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 17:39:54 +0900
Subject: [PATCH 214/709] Add xmldoc

---
 osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs b/osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs
index 11b81b26fd..baffe106ed 100644
--- a/osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/SizePreservingSpriteText.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
@@ -14,6 +12,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.Sprites
 {
+    /// <summary>
+    /// A wrapped version of <see cref="OsuSpriteText"/> which will expand in size based on text content, but never shrink back down.
+    /// </summary>
     public class SizePreservingSpriteText : CompositeDrawable
     {
         private readonly OsuSpriteText text = new OsuSpriteText();

From 68d1b7d7cf61603c1ee05e4958be1aec371cc8d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 17:48:51 +0900
Subject: [PATCH 215/709] Reduce test count

---
 .../TestSceneUprightAspectMaintainingContainer.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
index f81f8e8d85..00ecc166d5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private readonly List<List<UprightAspectMaintainingContainer>> childContainers = new List<List<UprightAspectMaintainingContainer>>(rows);
 
         // Preferably should be set to (4 * 2^n)
-        private const int rotation_step_count = 8;
+        private const int rotation_step_count = 3;
 
         private readonly List<int> flipStates = new List<int>();
         private readonly List<float> rotationSteps = new List<float>();
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             flipStates.AddRange(new[] { 1, -1 });
             rotationSteps.AddRange(Enumerable.Range(0, rotation_step_count).Select(x => 360f * ((float)x / rotation_step_count)));
-            scaleSteps.AddRange(new[] { 1, 0.5f, 0.3f, 1.5f, 2.0f });
+            scaleSteps.AddRange(new[] { 1, 0.3f, 1.5f });
         }
 
         [Test]

From 9ec399a25ac560d409930d0387499ed247e0c549 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 17:49:31 +0900
Subject: [PATCH 216/709] Remove NRT overrides in new tests

---
 .../Visual/UserInterface/TestSceneSizePreservingSpriteText.cs   | 2 --
 .../UserInterface/TestSceneUprightAspectMaintainingContainer.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs
index 69f5015af6..c4568d9aeb 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSizePreservingSpriteText.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
index 00ecc166d5..67c26829df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUprightAspectMaintainingContainer.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;

From a2f96ea120b9461edae3194e0bf7a6229fedceab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 17:55:29 +0900
Subject: [PATCH 217/709] Make `random` implicitly null to avoid potential
 incorrect behaviour in `randomBool`

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 17df1bf489..056a325dce 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
 
-        private Random? rng;
+        private Random random = null!;
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             Seed.Value ??= RNG.Next();
 
-            rng = new Random((int)Seed.Value);
+            random = new Random((int)Seed.Value);
 
             var positionInfos = OsuHitObjectGenerationUtils.GeneratePositionInfos(osuBeatmap.HitObjects);
 
@@ -50,14 +50,14 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (shouldStartNewSection(osuBeatmap, positionInfos, i))
                 {
-                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.0008f);
+                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.0008f);
                     flowDirection = !flowDirection;
                 }
 
                 if (i == 0)
                 {
-                    positionInfos[i].DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
-                    positionInfos[i].RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
+                    positionInfos[i].DistanceFromPrevious = (float)(random.NextDouble() * OsuPlayfield.BASE_SIZE.Y / 2);
+                    positionInfos[i].RelativeAngle = (float)(random.NextDouble() * 2 * Math.PI - Math.PI);
                 }
                 else
                 {
@@ -65,11 +65,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                     float flowChangeOffset = 0;
 
                     // Offsets only the angle of the current hit object.
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
+                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
 
                     if (shouldApplyFlowChange(positionInfos, i))
                     {
-                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(rng, 0, 0.002f);
+                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
                         flowDirection = !flowDirection;
                     }
 
@@ -108,9 +108,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             bool previousObjectWasOnDownbeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject, true);
             bool previousObjectWasOnBeat = OsuHitObjectGenerationUtils.IsHitObjectOnBeat(beatmap, positionInfos[i - 1].HitObject);
 
-            return (previousObjectStartedCombo && randomBool(0.6f)) ||
+            return (previousObjectStartedCombo && random.NextDouble() < 0.6f) ||
                    previousObjectWasOnDownbeat ||
-                   (previousObjectWasOnBeat && randomBool(0.4f));
+                   (previousObjectWasOnBeat && random.NextDouble() < 0.4f);
         }
 
         /// <returns>Whether a flow change should be applied at the current <see cref="OsuHitObject"/>.</returns>
@@ -120,11 +120,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             bool previousObjectStartedCombo = positionInfos[Math.Max(0, i - 2)].HitObject.IndexInCurrentCombo > 1 &&
                                               positionInfos[i - 1].HitObject.NewCombo;
 
-            return previousObjectStartedCombo && randomBool(0.6f);
+            return previousObjectStartedCombo && random.NextDouble() < 0.6f;
         }
-
-        /// <returns>true with a probability of <paramref name="probability"/>, false otherwise.</returns>
-        private bool randomBool(float probability) =>
-            rng?.NextDouble() < probability;
     }
 }

From 31cd7cdca0902e10605552cfdb004531bfb4a3df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 18:00:51 +0900
Subject: [PATCH 218/709] Refactor `IsHitObjectOnBeat` to be understandable

---
 .../Utils/OsuHitObjectGenerationUtils.cs         | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
index a890dbde43..3a8b3f67d0 100644
--- a/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
+++ b/osu.Game.Rulesets.Osu/Utils/OsuHitObjectGenerationUtils.cs
@@ -195,19 +195,17 @@ namespace osu.Game.Rulesets.Osu.Utils
         /// <returns>true if hitObject is on a (down-)beat, false otherwise.</returns>
         public static bool IsHitObjectOnBeat(OsuBeatmap beatmap, OsuHitObject hitObject, bool downbeatsOnly = false)
         {
-            var timingPoints = beatmap.ControlPointInfo.TimingPoints;
-            var currentTimingPoint = timingPoints.LastOrDefault(p => p.Time <= hitObject.StartTime);
+            var timingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
 
-            if (currentTimingPoint == null)
-                return false;
+            double timeSinceTimingPoint = hitObject.StartTime - timingPoint.Time;
 
-            double timeSinceTimingPoint = hitObject.StartTime - currentTimingPoint.Time;
+            double beatLength = timingPoint.BeatLength;
 
-            double length = downbeatsOnly
-                ? currentTimingPoint.BeatLength * currentTimingPoint.TimeSignature.Numerator
-                : currentTimingPoint.BeatLength;
+            if (downbeatsOnly)
+                beatLength *= timingPoint.TimeSignature.Numerator;
 
-            return (timeSinceTimingPoint + 1) % length < 2;
+            // Ensure within 1ms of expected location.
+            return Math.Abs(timeSinceTimingPoint + 1) % beatLength < 2;
         }
 
         /// <summary>

From 7d100c5eeca6aab52fc624b31f99b4d66515d01d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 18:10:10 +0900
Subject: [PATCH 219/709] Fix test in line with new expectations

---
 .../Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
index 0af876bfe8..5afda0ad0c 100644
--- a/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
+++ b/osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardThumbnail.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
                 };
             });
             AddStep("enable dim", () => thumbnail.Dimmed.Value = true);
-            AddUntilStep("button visible", () => playButton.IsPresent);
+            AddUntilStep("button visible", () => playButton.Alpha == 1);
 
             AddStep("click button", () =>
             {
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
 
             AddStep("disable dim", () => thumbnail.Dimmed.Value = false);
             AddWaitStep("wait some", 3);
-            AddAssert("button still visible", () => playButton.IsPresent);
+            AddAssert("button still visible", () => playButton.Alpha == 1);
 
             // The track plays in real-time, so we need to check for progress in increments to avoid timeout.
             AddUntilStep("progress > 0.25", () => thumbnail.ChildrenOfType<PlayButton>().Single().Progress.Value > 0.25);
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Beatmaps
             AddUntilStep("progress > 0.75", () => thumbnail.ChildrenOfType<PlayButton>().Single().Progress.Value > 0.75);
 
             AddUntilStep("wait for track to end", () => !playButton.Playing.Value);
-            AddUntilStep("button hidden", () => !playButton.IsPresent);
+            AddUntilStep("button hidden", () => playButton.Alpha == 0);
         }
 
         private void iconIs(IconUsage usage) => AddUntilStep("icon is correct", () => playButton.ChildrenOfType<SpriteIcon>().Any(icon => icon.Icon.Equals(usage)));

From 602ffebd54d79e76bb19a4b95572b4023f07562f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Sep 2022 23:29:04 +0900
Subject: [PATCH 220/709] Apply NRT and fix code style

---
 osu.Game/Screens/Select/FilterQueryParser.cs | 25 ++++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 75574c061d..a7c1aec361 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -126,16 +124,21 @@ namespace osu.Game.Screens.Select
         {
             if (Enum.TryParse(value, true, out result)) return true;
 
-            value = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
+            string? prefixMatch = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
+
+            if (prefixMatch == null)
+                return false;
+
             return Enum.TryParse(value, true, out result);
         }
-        private static GroupCollection tryMatchRegex(string value, string regex)
+
+        private static GroupCollection? tryMatchRegex(string value, string regex)
         {
-            Match matchs = Regex.Match(value, regex);
-            if (matchs.Success)
-            {
-                return matchs.Groups;
-            }
+            Match matches = Regex.Match(value, regex);
+
+            if (matches.Success)
+                return matches.Groups;
+
             return null;
         }
 
@@ -324,7 +327,8 @@ namespace osu.Game.Screens.Select
         {
             List<string> parts = new List<string>();
 
-            GroupCollection match = null;
+            GroupCollection? match = null;
+
             match ??= tryMatchRegex(val, @"^((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+)$");
             match ??= tryMatchRegex(val, @"^((?<hours>\d+(\.\d+)?)h)?((?<minutes>\d+(\.\d+)?)m)?((?<seconds>\d+(\.\d+)?)s)?$");
             match ??= tryMatchRegex(val, @"^(?<seconds>\d+(\.\d+)?)$");
@@ -358,6 +362,7 @@ namespace osu.Game.Screens.Select
                 totalLength += length * scale;
                 minScale = Math.Min(minScale, scale);
             }
+
             return tryUpdateCriteriaRange(ref criteria.Length, op, totalLength, minScale / 2.0);
         }
     }

From 6338b87c63721b941a68397a18b9c2f195be3374 Mon Sep 17 00:00:00 2001
From: StanR <hi@stanr.info>
Date: Fri, 9 Sep 2022 17:31:52 +0300
Subject: [PATCH 221/709] attributes

---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 6a221c1a73..2b0e2db898 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         private double computeAimValue(ScoreInfo score, OsuDifficultyAttributes attributes)
         {
-            double aimValue = Math.Pow(5.0 * Math.Max(1.0, Attributes.AimDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
+            double aimValue = Math.Pow(5.0 * Math.Max(1.0, attributes.AimDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
 
             double lengthBonus = 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
                                  (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);

From ae53e27e6cad2157dba515c71946012dcbca1c5d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 9 Sep 2022 19:39:01 +0300
Subject: [PATCH 222/709] Adjust test coverage to read better

---
 .../SongSelect/TestSceneTopLocalRank.cs       | 63 ++++++-------------
 1 file changed, 19 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
index 1a72dc2a72..cced9b8b89 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
@@ -1,14 +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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Extensions;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -49,12 +47,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Create local rank", () =>
             {
-                Add(topLocalRank = new TopLocalRank(importedBeatmap)
+                Child = topLocalRank = new TopLocalRank(importedBeatmap)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Scale = new Vector2(10),
-                });
+                };
             });
 
             AddAssert("No rank displayed initially", () => topLocalRank.DisplayedRank == null);
@@ -63,7 +61,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestBasicImportDelete()
         {
-            ScoreInfo? testScoreInfo = null;
+            ScoreInfo testScoreInfo = null!;
 
             AddStep("Add score for current user", () =>
             {
@@ -77,10 +75,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
 
-            AddStep("Delete score", () =>
-            {
-                scoreManager.Delete(testScoreInfo.AsNonNull());
-            });
+            AddStep("Delete score", () => scoreManager.Delete(testScoreInfo));
 
             AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
         }
@@ -88,11 +83,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRulesetChange()
         {
-            ScoreInfo testScoreInfo;
-
             AddStep("Add score for current user", () =>
             {
-                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
@@ -112,11 +105,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestHigherScoreSet()
         {
-            ScoreInfo? testScoreInfo = null;
-
             AddStep("Add score for current user", () =>
             {
-                testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
+                var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
@@ -131,28 +122,20 @@ namespace osu.Game.Tests.Visual.SongSelect
                 var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo2.User = API.LocalUser.Value;
-                testScoreInfo2.Rank = ScoreRank.S;
-                testScoreInfo2.TotalScore = testScoreInfo.AsNonNull().TotalScore + 1;
-                testScoreInfo2.Statistics = new Dictionary<HitResult, int>
-                {
-                    [HitResult.Miss] = 0,
-                    [HitResult.Perfect] = 970,
-                    [HitResult.SmallTickHit] = 75,
-                    [HitResult.LargeTickHit] = 150,
-                    [HitResult.LargeBonus] = 10,
-                    [HitResult.SmallBonus] = 50
-                };
+                testScoreInfo2.Rank = ScoreRank.X;
+                testScoreInfo2.TotalScore = 1000000;
+                testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
 
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S);
+            AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
         }
 
         [Test]
         public void TestLegacyScore()
         {
-            ScoreInfo? testScoreInfo = null;
+            ScoreInfo testScoreInfo = null!;
 
             AddStep("Add legacy score for current user", () =>
             {
@@ -160,7 +143,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 testScoreInfo.User = API.LocalUser.Value;
                 testScoreInfo.Rank = ScoreRank.B;
-                testScoreInfo.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo, ScoringMode.Classic).GetResultSafely();
+                testScoreInfo.TotalScore = scoreManager.GetTotalScore(testScoreInfo, ScoringMode.Classic);
 
                 scoreManager.Import(testScoreInfo);
             });
@@ -172,26 +155,18 @@ namespace osu.Game.Tests.Visual.SongSelect
                 var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
 
                 testScoreInfo2.User = API.LocalUser.Value;
-                testScoreInfo2.Rank = ScoreRank.S;
-                testScoreInfo2.Statistics = new Dictionary<HitResult, int>
-                {
-                    [HitResult.Miss] = 0,
-                    [HitResult.Perfect] = 970,
-                    [HitResult.SmallTickHit] = 75,
-                    [HitResult.LargeTickHit] = 150,
-                    [HitResult.LargeBonus] = 10,
-                    [HitResult.SmallBonus] = 50
-                };
+                testScoreInfo2.Rank = ScoreRank.X;
+                testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
+                testScoreInfo2.TotalScore = scoreManager.GetTotalScore(testScoreInfo2);
 
-                testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo.AsNonNull()).GetResultSafely();
-
-                // ensure standardised total score is less than classic, otherwise this test is pointless.
-                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.AsNonNull().TotalScore);
+                // ensure second score has a total score (standardised) less than first one (classic)
+                // despite having better statistics, otherwise this test is pointless.
+                Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
 
                 scoreManager.Import(testScoreInfo2);
             });
 
-            AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S);
+            AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
         }
     }
 }

From 95062c2cc8fc804eb8e4a7d52d28e1f8b190d6c7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 9 Sep 2022 19:42:58 +0300
Subject: [PATCH 223/709] Remove center origin specification to avoid
 single-frame layout issues

---
 osu.Game/Screens/Select/Carousel/TopLocalRank.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
index cb2ff86794..0f000555d5 100644
--- a/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
+++ b/osu.Game/Screens/Select/Carousel/TopLocalRank.cs
@@ -49,8 +49,6 @@ namespace osu.Game.Screens.Select.Carousel
 
             InternalChild = updateable = new UpdateableRank
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
                 Size = new Vector2(40, 20),
                 Alpha = 0,
             };

From 5e4e3dfc2cb8ea50f83d4edbaab4f8ab19a77e8a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 10 Sep 2022 02:55:20 +0300
Subject: [PATCH 224/709] Fix markdown container not rendering certain text
 correctly

---
 .../Markdown/OsuMarkdownContainer.cs          | 36 ++++++++++++++++---
 .../Comments/CommentMarkdownContainer.cs      |  2 ++
 .../Wiki/Markdown/WikiMarkdownContainer.cs    |  2 ++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index a2370a76cb..62fefe201d 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -4,7 +4,9 @@
 #nullable disable
 
 using Markdig;
-using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Extensions.AutoLinks;
+using Markdig.Extensions.EmphasisExtras;
+using Markdig.Extensions.Footnotes;
 using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
@@ -18,6 +20,18 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
+        /// <summary>
+        /// Allows this markdown container to parse and link footnotes.
+        /// </summary>
+        /// <seealso cref="FootnoteExtension"/>
+        protected virtual bool Footnotes => false;
+
+        /// <summary>
+        /// Allows this markdown container to make URL text clickable.
+        /// </summary>
+        /// <seealso cref="AutoLinkExtension"/>
+        protected virtual bool Autolinks => false;
+
         public OsuMarkdownContainer()
         {
             LineSpacing = 21;
@@ -78,10 +92,22 @@ namespace osu.Game.Graphics.Containers.Markdown
             return new OsuMarkdownUnorderedListItem(level);
         }
 
+        // reference: https://github.com/ppy/osu-web/blob/05488a96b25b5a09f2d97c54c06dd2bae59d1dc8/app/Libraries/Markdown/OsuMarkdown.php#L301
         protected override MarkdownPipeline CreateBuilder()
-            => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
-                                            .UseEmojiAndSmiley()
-                                            .UseYamlFrontMatter()
-                                            .UseAdvancedExtensions().Build();
+        {
+            var pipeline = new MarkdownPipelineBuilder()
+                           .UseAutoIdentifiers()
+                           .UsePipeTables()
+                           .UseEmphasisExtras(EmphasisExtraOptions.Strikethrough)
+                           .UseYamlFrontMatter();
+
+            if (Footnotes)
+                pipeline = pipeline.UseFootnotes();
+
+            if (Autolinks)
+                pipeline = pipeline.UseAutoLinks();
+
+            return pipeline.Build();
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index 8fc011b2bf..b32b1c74c4 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Overlays.Comments
 {
     public class CommentMarkdownContainer : OsuMarkdownContainer
     {
+        protected override bool Autolinks => true;
+
         protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
 
         private class CommentMarkdownHeading : OsuMarkdownHeading
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 7754c1d450..4f1083a75c 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Overlays.Wiki.Markdown
 {
     public class WikiMarkdownContainer : OsuMarkdownContainer
     {
+        protected override bool Footnotes => true;
+
         public string CurrentPath
         {
             set => DocumentUrl = value;

From ec86700f2903bca40fd9cbc7f5a0d062e0373466 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Sat, 10 Sep 2022 10:45:51 +0800
Subject: [PATCH 225/709] Add the nullable disable annotation back becuse it
 will cause the api broken if remove the nullable disable annotation in the
 mania ruleset.

---
 .../Configuration/ManiaRulesetConfigManager.cs                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 64e1f75e2c..b30d72f2e2 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -1,6 +1,8 @@
 // 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.
 
+#nullable disable
+
 using System;
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;

From 2f91b5c846b4055422574620717416c60480f60d Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Sat, 10 Sep 2022 10:46:10 +0800
Subject: [PATCH 226/709] Add missing import.

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs     | 1 +
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 24a4f16e9f..90733e0206 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.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.Linq;
 using osu.Framework.Extensions.EnumExtensions;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index b53dc67584..90d9ffe527 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.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.Linq;
 using osu.Framework.Extensions.EnumExtensions;

From 1398a7e11ebffc6815bf26a33a615ae63e30f54c Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Sat, 10 Sep 2022 10:46:40 +0800
Subject: [PATCH 227/709] Property should accept the nullable state.

---
 osu.Game/Online/API/APIMod.cs                         | 2 +-
 osu.Game/Overlays/Settings/Sections/RulesetSection.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index dcbaaea012..176f10975d 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online.API
 
         public Mod ToMod(Ruleset ruleset)
         {
-            Mod resultMod = ruleset.CreateModFromAcronym(Acronym);
+            Mod? resultMod = ruleset.CreateModFromAcronym(Acronym);
 
             if (resultMod == null)
             {
diff --git a/osu.Game/Overlays/Settings/Sections/RulesetSection.cs b/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
index a5f5810214..6f0b3c27a0 100644
--- a/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/RulesetSection.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections
             {
                 try
                 {
-                    SettingsSubsection section = ruleset.CreateSettings();
+                    SettingsSubsection? section = ruleset.CreateSettings();
 
                     if (section != null)
                         Add(section);

From 3d7367a8420ca60b029d4b557b7458dff7e7d487 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Sat, 10 Sep 2022 11:07:23 +0800
Subject: [PATCH 228/709] Move the CreateConvertibleReplayFrame() into the base
 ruleset class for avoid api breaking change in the customized ruleset.

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 2 +-
 osu.Game/Rulesets/ILegacyRuleset.cs           | 9 ---------
 osu.Game/Rulesets/Ruleset.cs                  | 8 ++++++++
 osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs | 2 +-
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 7 ++-----
 8 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index d2e05fbeb9..999b9f6e2c 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Catch
 
         public int LegacyID => 2;
 
-        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
+        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();
 
         public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 72be77ddab..c6a5e8bdaa 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Rulesets.Mania
 
         public int LegacyID => 3;
 
-        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
+        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new ManiaReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new ManiaRulesetConfigManager(settings, RulesetInfo);
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 90733e0206..6af765361d 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Osu
 
         public int LegacyID => 0;
 
-        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
+        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new OsuReplayFrame();
 
         public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new OsuRulesetConfigManager(settings, RulesetInfo);
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 90d9ffe527..6beb83575d 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Rulesets.Taiko
 
         public int LegacyID => 1;
 
-        public IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
+        public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new TaikoReplayFrame();
 
         protected override IEnumerable<HitResult> GetValidHitResults()
         {
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index c2617a065c..f4b03baccd 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -1,8 +1,6 @@
 // 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.Replays.Types;
-
 namespace osu.Game.Rulesets
 {
     public interface ILegacyRuleset
@@ -13,12 +11,5 @@ namespace osu.Game.Rulesets
         /// Identifies the server-side ID of a legacy ruleset.
         /// </summary>
         int LegacyID { get; }
-
-        /// <summary>
-        /// For rulesets which support legacy (osu-stable) replay conversion, this method will create an empty replay frame
-        /// for conversion use.
-        /// </summary>
-        /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
-        IConvertibleReplayFrame CreateConvertibleReplayFrame();
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index a10575ef73..4bc82a5f7e 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
@@ -302,6 +303,13 @@ namespace osu.Game.Rulesets
         /// <returns>A descriptive name of the variant.</returns>
         public virtual LocalisableString GetVariantName(int variant) => string.Empty;
 
+        /// <summary>
+        /// For rulesets which support legacy (osu-stable) replay conversion, this method will create an empty replay frame
+        /// for conversion use.
+        /// </summary>
+        /// <returns>An empty frame for the current ruleset, or null if unsupported.</returns>
+        public virtual IConvertibleReplayFrame? CreateConvertibleReplayFrame() => null;
+
         /// <summary>
         /// Creates the statistics for a <see cref="ScoreInfo"/> to be displayed in the results screen.
         /// </summary>
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
index 2b22b4abc7..f64e730c06 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreDecoder.cs
@@ -282,7 +282,7 @@ namespace osu.Game.Scoring.Legacy
 
         private ReplayFrame convertFrame(LegacyReplayFrame currentFrame, ReplayFrame lastFrame)
         {
-            var convertible = (currentRuleset as ILegacyRuleset)?.CreateConvertibleReplayFrame();
+            var convertible = currentRuleset.CreateConvertibleReplayFrame();
             if (convertible == null)
                 throw new InvalidOperationException($"Legacy replay cannot be converted for the ruleset: {currentRuleset.Description}");
 
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 659d7d5d6c..68cc21fc1c 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Spectator;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
@@ -81,14 +80,12 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
-            var legacyRuleset = GameplayState.Ruleset as ILegacyRuleset;
-            Debug.Assert(legacyRuleset != null);
-
             bool isFirstBundle = score.Replay.Frames.Count == 0;
 
             foreach (var frame in bundle.Frames)
             {
-                IConvertibleReplayFrame convertibleFrame = legacyRuleset.CreateConvertibleReplayFrame();
+                IConvertibleReplayFrame convertibleFrame = GameplayState.Ruleset.CreateConvertibleReplayFrame();
+                Debug.Assert(convertibleFrame != null);
                 convertibleFrame.FromLegacy(frame, GameplayState.Beatmap);
 
                 var convertedFrame = (ReplayFrame)convertibleFrame;

From b056cac10a1259044e65e67ab059f108b66c23bb Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 08:21:38 +0300
Subject: [PATCH 229/709] Remove generic and add default implementation for
 `CalculateEffect`

---
 .../Overlays/Mods/DifficultyMultiplierDisplay.cs   |  3 +--
 osu.Game/Overlays/Mods/ModSelectOverlay.cs         |  4 ++--
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs        | 14 ++++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 843310249e..5530947d3d 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -16,10 +16,9 @@ using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Mods
 {
-    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay<double>
+    public sealed class DifficultyMultiplierDisplay : ModsEffectDisplay
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
-        protected override ModEffect CalculateEffect(double value) => CalculateForSign(value.CompareTo(1d));
 
         private readonly MultiplierCounter multiplierCounter;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 80f18eafeb..ccc075b190 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Mods
                     {
                         Padding = new MarginPadding
                         {
-                            Top = (ShowTotalMultiplier ? ModsEffectDisplay<int>.HEIGHT : 0) + PADDING,
+                            Top = (ShowTotalMultiplier ? ModsEffectDisplay.HEIGHT : 0) + PADDING,
                             Bottom = PADDING
                         },
                         RelativeSizeAxes = Axes.Both,
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays.Mods
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     AutoSizeAxes = Axes.X,
-                    Height = ModsEffectDisplay<int>.HEIGHT,
+                    Height = ModsEffectDisplay.HEIGHT,
                     Margin = new MarginPadding { Horizontal = 100 },
                     Child = multiplierDisplay = new DifficultyMultiplierDisplay
                     {
diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 2ff6bf043b..4e630439ee 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// Base class for displays of mods effects.
     /// </summary>
-    public abstract class ModsEffectDisplay<TValue> : Container, IHasCurrentValue<TValue>
+    public abstract class ModsEffectDisplay : Container, IHasCurrentValue<double>
     {
         public const float HEIGHT = 42;
         private const float transition_duration = 200;
@@ -28,13 +28,13 @@ namespace osu.Game.Overlays.Mods
         private readonly Box labelBackground;
         private readonly Container content;
 
-        public Bindable<TValue> Current
+        public Bindable<double> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
-        private readonly BindableWithCurrent<TValue> current = new BindableWithCurrent<TValue>();
+        private readonly BindableWithCurrent<double> current = new BindableWithCurrent<double>();
 
         [Resolved]
         private OsuColour colours { get; set; } = null!;
@@ -52,7 +52,13 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
         /// <returns>Effect of the value.</returns>
-        protected abstract ModEffect CalculateEffect(TValue value);
+        /// <remarks>
+        /// Default implementation compares the value with <see cref="Current"/>.<see cref="Bindable{T}.Default"/>, bigger value counts as difficulty increase.
+        /// </remarks>
+        protected virtual ModEffect CalculateEffect(double value)
+        {
+            return CalculateForSign(value.CompareTo(Current.Default));
+        }
 
         protected virtual float ValueAreaWidth => 56;
 

From efe3b1aa7bd047847510fe50f75f1f87d0c2f78b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Sep 2022 14:10:49 +0900
Subject: [PATCH 230/709] Allow dismissing notifications without performing
 action using middle / right click

---
 .../TestSceneNotificationOverlay.cs           | 60 ++++++++++++++++++-
 .../Overlays/Notifications/Notification.cs    | 19 +++++-
 2 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 699b8f7d89..c0b29dde9a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -12,11 +12,13 @@ using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestSceneNotificationOverlay : OsuTestScene
+    public class TestSceneNotificationOverlay : OsuManualInputManagerTestScene
     {
         private NotificationOverlay notificationOverlay = null!;
 
@@ -32,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             TimeToCompleteProgress = 2000;
             progressingNotifications.Clear();
 
-            Content.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 notificationOverlay = new NotificationOverlay
                 {
@@ -45,6 +47,60 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestDismissWithoutActivationRightClick()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("click to activate", () =>
+            {
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
+                InputManager.Click(MouseButton.Right);
+            });
+
+            AddUntilStep("wait for closed", () => notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+        }
+
+        [Test]
+        public void TestActivate()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("click to activate", () =>
+            {
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for closed", () => notification.WasClosed);
+            AddAssert("was activated", () => activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+        }
+
         [Test]
         public void TestPresence()
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index e5f739bb08..09abdb865d 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Overlays.Notifications
 {
@@ -170,11 +171,25 @@ namespace osu.Game.Overlays.Notifications
             base.OnHoverLost(e);
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            // right click doesn't trigger OnClick so we need to handle here until that changes.
+            if (e.Button != MouseButton.Left)
+            {
+                Close();
+                return true;
+            }
+
+            return base.OnMouseDown(e);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
-            if (Activated?.Invoke() ?? true)
-                Close();
+            // Clicking with anything but left button should dismiss but not perform the activation action.
+            if (e.Button == MouseButton.Left)
+                Activated?.Invoke();
 
+            Close();
             return true;
         }
 

From a9094c6b03bf302382cf171c72a5f217e2668189 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Sep 2022 15:18:32 +0900
Subject: [PATCH 231/709] Add test coverage of clicking close button to dismiss

---
 .../TestSceneNotificationOverlay.cs           | 29 +++++++++++++++++++
 .../Overlays/Notifications/Notification.cs    |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index c0b29dde9a..5f82a0024b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -47,6 +47,35 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestDismissWithoutActivationCloseButton()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("click to activate", () =>
+            {
+                InputManager.MoveMouseTo(notificationOverlay
+                                         .ChildrenOfType<Notification>().Single()
+                                         .ChildrenOfType<Notification.CloseButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for closed", () => notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+        }
+
         [Test]
         public void TestDismissWithoutActivationRightClick()
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 09abdb865d..67739c2089 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Overlays.Notifications
             Expire();
         }
 
-        private class CloseButton : OsuClickableContainer
+        internal class CloseButton : OsuClickableContainer
         {
             private SpriteIcon icon = null!;
             private Box background = null!;

From f6aef73f9ee1f4cb76a31cbed78741d4b5675fd8 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Sat, 10 Sep 2022 20:30:43 +0200
Subject: [PATCH 232/709] fixed shape bindable not working, test creation,
 removal of Clear(), adjusted settings names

---
 .../Gameplay/TestSceneColourHitErrorMeter.cs  | 119 ++++++++++++++++++
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |  12 +-
 2 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
new file mode 100644
index 0000000000..7cbc70c605
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -0,0 +1,119 @@
+// 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.
+
+#nullable disable
+using System;
+using System.Diagnostics;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneColourHitErrorMeter : OsuTestScene
+    {
+        private DependencyProvidingContainer dependencyContainer;
+
+        private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
+        private ScoreProcessor scoreProcessor;
+        private int iteration;
+        private ColourHitErrorMeter colourHitErrorMeter;
+
+        public TestSceneColourHitErrorMeter()
+        {
+            AddSliderStep("Manual Opacity test", 0.01f, 1, 1, alpha =>
+            {
+                if (colourHitErrorMeter != null) colourHitErrorMeter.HitShapeOpacity.Value = alpha;
+            });
+            AddSliderStep("Manual spacing test", 0, 10, 2, spacing =>
+            {
+                if (colourHitErrorMeter != null) colourHitErrorMeter.HitShapeSpacing.Value = spacing;
+            });
+        }
+
+        [SetUpSteps]
+        public void SetupSteps() => AddStep("Create components", () =>
+        {
+            var ruleset = CreateRuleset();
+
+            Debug.Assert(ruleset != null);
+
+            scoreProcessor = new ScoreProcessor(ruleset);
+            Child = dependencyContainer = new DependencyProvidingContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                CachedDependencies = new (Type, object)[]
+                {
+                    (typeof(ScoreProcessor), scoreProcessor)
+                }
+            };
+            dependencyContainer.Child = colourHitErrorMeter = new ColourHitErrorMeter
+            {
+                Margin = new MarginPadding
+                {
+                    Top = 100
+                },
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                Scale = new Vector2(2),
+            };
+        });
+
+        protected override Ruleset CreateRuleset() => new OsuRuleset();
+
+        [Test]
+        public void TestOpacityChange()
+        {
+            AddRepeatStep("Add judgement", applyOneJudgement, 5);
+            AddStep("Change opacity to 30%", () => colourHitErrorMeter.HitShapeOpacity.Value = 0.3f);
+            AddRepeatStep("Add judgement", applyOneJudgement, 5);
+        }
+
+        [Test]
+        public void TestSpacingChange()
+        {
+            AddRepeatStep("Add judgement", applyOneJudgement, 5);
+            AddStep("Change spacing", () => colourHitErrorMeter.HitShapeSpacing.Value = 10);
+            AddRepeatStep("Add judgement", applyOneJudgement, 5);
+        }
+
+        [Test]
+        public void TestShapeChange()
+        {
+            AddRepeatStep("Add judgement", applyOneJudgement, 10);
+            AddStep("Judgement count change to 4", () => colourHitErrorMeter.HitShapeCount.Value = 4);
+            AddRepeatStep("Add judgement", applyOneJudgement, 8);
+        }
+
+        [Test]
+        public void TestHitErrorShapeChange()
+        {
+            AddRepeatStep("Add judgement", applyOneJudgement, 8);
+            AddStep("Change shape square", () => colourHitErrorMeter.HitShape.Value = ColourHitErrorMeter.ShapeStyle.Square);
+            AddRepeatStep("Add judgement", applyOneJudgement, 10);
+        }
+
+        private void applyOneJudgement()
+        {
+            lastJudgementResult.Value = new OsuJudgementResult(new HitObject
+            {
+                StartTime = iteration * 10000,
+            }, new OsuJudgement())
+            {
+                Type = HitResult.Great,
+            };
+            scoreProcessor.ApplyResult(lastJudgementResult.Value);
+
+            iteration++;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index c218ff11e9..b5a8cfc44f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
 
-        [SettingSource("Hit error amount", "Number of hit error shapes")]
+        [SettingSource("Judgement count", "Number of displayed judgements")]
         public BindableNumber<int> HitShapeCount { get; } = new BindableNumber<int>(20)
         {
             MinValue = 1,
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             Precision = 1
         };
 
-        [SettingSource("Opacity", "Visibility of object")]
+        [SettingSource("Opacity", "Visibility of the displayed judgements")]
         public BindableNumber<float> HitShapeOpacity { get; } = new BindableNumber<float>(1)
         {
             MinValue = 0.01f,
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             Precision = 0.01f,
         };
 
-        [SettingSource("Spacing", "Space between hit error shapes")]
+        [SettingSource("Spacing", "Space between each displayed judgement")]
         public BindableNumber<float> HitShapeSpacing { get; } = new BindableNumber<float>(2)
         {
             MinValue = 0,
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             Precision = 0.1f
         };
 
-        [SettingSource("Shape", "The shape of each displayed error")]
+        [SettingSource("Shape", "The shape of each displayed judgement")]
         public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>();
 
         private readonly JudgementFlow judgementsFlow;
@@ -74,9 +74,11 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }, true);
             HitShapeCount.BindValueChanged(_ =>
             {
-                judgementsFlow.Clear();
+                //Used to clear out the overflowing judgement children when the value is lowered
+                judgementsFlow.RemoveAll(_ => true);
                 judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
             }, true);
+            HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true);
         }
 
         public override void Clear() => judgementsFlow.Clear();

From 46d9262a6066c47f5fdf694e5d1ea78bb5dabec6 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Sat, 10 Sep 2022 20:38:34 +0200
Subject: [PATCH 233/709] test naming oversight

---
 osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index 7cbc70c605..5fdd00a7f6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestShapeChange()
+        public void TestJudgementAmountChange()
         {
             AddRepeatStep("Add judgement", applyOneJudgement, 10);
             AddStep("Judgement count change to 4", () => colourHitErrorMeter.HitShapeCount.Value = 4);

From c00bf612738c7a75ab00803349eeeea664b61186 Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Sat, 10 Sep 2022 21:24:29 +0200
Subject: [PATCH 234/709] Framework change adressed

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index b5a8cfc44f..8991d97bd4 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             HitShapeCount.BindValueChanged(_ =>
             {
                 //Used to clear out the overflowing judgement children when the value is lowered
-                judgementsFlow.RemoveAll(_ => true);
+                judgementsFlow.RemoveAll(_ => true, true);
                 judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
             }, true);
             HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true);

From 667854b03445f7eb73292fa40fcc84ac2970fd4a Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:18:48 +0300
Subject: [PATCH 235/709] Make effect display have a built-in counter

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 37 +++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 4e630439ee..98651ef5f0 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -11,6 +12,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 
@@ -26,7 +28,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Box contentBackground;
         private readonly Box labelBackground;
-        private readonly Container content;
+        private readonly FillFlowContainer content;
 
         public Bindable<double> Current
         {
@@ -62,6 +64,8 @@ namespace osu.Game.Overlays.Mods
 
         protected virtual float ValueAreaWidth => 56;
 
+        protected virtual string CounterFormat => "N0";
+
         protected override Container<Drawable> Content => content;
 
         protected ModsEffectDisplay()
@@ -121,12 +125,20 @@ namespace osu.Game.Overlays.Mods
                                         }
                                     }
                                 },
-                                content = new Container
+                                content = new FillFlowContainer
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0)
+                                    Direction = FillDirection.Horizontal,
+                                    Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
+                                    Spacing = new Vector2(2, 0),
+                                    Child = new EffectCounter(CounterFormat)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Current = { BindTarget = Current }
+                                    }
                                 }
                             }
                         }
@@ -203,5 +215,24 @@ namespace osu.Game.Overlays.Mods
             DifficultyReduction,
             DifficultyIncrease
         }
+
+        private class EffectCounter : RollingCounter<double>
+        {
+            private readonly string? format;
+
+            public EffectCounter(string? format)
+            {
+                this.format = format;
+            }
+
+            protected override double RollingDuration => 500;
+
+            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(format);
+
+            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
+            {
+                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
+            };
+        }
     }
 }

From 064fe832c78196b05cd0a807951747940e81d39b Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:18:59 +0300
Subject: [PATCH 236/709] Fix test

---
 .../TestSceneModsEffectDisplay.cs              | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
index ec50a07998..42eceb3242 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModsEffectDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
@@ -54,28 +53,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("colours are correct", () => testDisplay.Container.Colour == colourProvider.Background5 && background.Colour == colours.ForModType(ModType.DifficultyIncrease));
         }
 
-        private class TestDisplay : ModsEffectDisplay<int>
+        private class TestDisplay : ModsEffectDisplay
         {
-            private readonly OsuSpriteText text;
-
             public Container<Drawable> Container => Content;
 
             protected override LocalisableString Label => "Test display";
-            protected override ModEffect CalculateEffect(int value) => CalculateForSign(value.CompareTo(50));
 
             public TestDisplay()
             {
-                Add(text = new OsuSpriteText
-                {
-                    Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold),
-                    Text = "50"
-                });
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                Current.BindValueChanged(e => text.Text = e.NewValue.ToString(), true);
+                Current.Default = 50;
             }
         }
     }

From 3f93ec8538d3082bd0255d46ec0995372c18ed90 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:20:28 +0300
Subject: [PATCH 237/709] Expose counter to inheritors

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 98651ef5f0..3b112fdbd3 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Overlays.Mods
 
         protected override Container<Drawable> Content => content;
 
+        protected readonly RollingCounter<double> Counter;
+
         protected ModsEffectDisplay()
         {
             Height = HEIGHT;
@@ -133,7 +135,7 @@ namespace osu.Game.Overlays.Mods
                                     Direction = FillDirection.Horizontal,
                                     Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
                                     Spacing = new Vector2(2, 0),
-                                    Child = new EffectCounter(CounterFormat)
+                                    Child = Counter = new EffectCounter(CounterFormat)
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,

From 324a3723a5dbba4b85f6d39617028acef7af005a Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 10 Sep 2022 23:23:04 +0300
Subject: [PATCH 238/709] Rewrite DMD

---
 .../Mods/DifficultyMultiplierDisplay.cs       | 48 ++++---------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
index 5530947d3d..f582a010c6 100644
--- a/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
+++ b/osu.Game/Overlays/Mods/DifficultyMultiplierDisplay.cs
@@ -3,14 +3,9 @@
 
 #nullable disable
 
-using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osu.Game.Localisation;
 
@@ -20,34 +15,19 @@ namespace osu.Game.Overlays.Mods
     {
         protected override LocalisableString Label => DifficultyMultiplierDisplayStrings.DifficultyMultiplier;
 
-        private readonly MultiplierCounter multiplierCounter;
+        protected override string CounterFormat => @"N2";
 
         public DifficultyMultiplierDisplay()
         {
             Current.Default = 1d;
             Current.Value = 1d;
-            Add(new FillFlowContainer
+            Add(new SpriteIcon
             {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(2, 0),
-                Children = new Drawable[]
-                {
-                    multiplierCounter = new MultiplierCounter
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Current = { BindTarget = Current }
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.Times,
-                        Size = new Vector2(7),
-                        Margin = new MarginPadding { Top = 1 }
-                    }
-                }
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Icon = FontAwesome.Solid.Times,
+                Size = new Vector2(7),
+                Margin = new MarginPadding { Top = 1 }
             });
         }
 
@@ -57,19 +37,7 @@ namespace osu.Game.Overlays.Mods
 
             // required to prevent the counter initially rolling up from 0 to 1
             // due to `Current.Value` having a nonstandard default value of 1.
-            multiplierCounter.SetCountWithoutRolling(Current.Value);
-        }
-
-        private class MultiplierCounter : RollingCounter<double>
-        {
-            protected override double RollingDuration => 500;
-
-            protected override LocalisableString FormatCount(double count) => count.ToLocalisableString(@"N2");
-
-            protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
-            {
-                Font = OsuFont.Default.With(size: 17, weight: FontWeight.SemiBold)
-            };
+            Counter.SetCountWithoutRolling(Current.Value);
         }
     }
 }

From 1eb2c74e57c3d18dfcac974bf7c52101a18806ec Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 11 Sep 2022 18:50:51 +0900
Subject: [PATCH 239/709] Fix countdown serialisation

---
 osu.Game/Online/Multiplayer/MultiplayerCountdown.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
index 61637ae970..fd22420b99 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Whether only a single instance of this <see cref="MultiplayerCountdown"/> type may be active at any one time.
         /// </summary>
+        [IgnoreMember]
         public virtual bool IsExclusive => true;
     }
 }

From d6f90e3b9fd23496db6c57b8a3cb5339cf691cca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:32:22 +0900
Subject: [PATCH 240/709] Add basic fling-to-dismiss support

---
 .../Overlays/Notifications/Notification.cs    | 132 +++++++++++++++++-
 1 file changed, 128 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 67739c2089..3e7bd0ab2f 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -2,16 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -56,6 +59,8 @@ namespace osu.Game.Overlays.Notifications
 
         protected Container MainContent;
 
+        private readonly DragContainer dragContainer;
+
         public virtual bool Read { get; set; }
 
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
@@ -80,7 +85,11 @@ namespace osu.Game.Overlays.Notifications
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreRight,
                 },
-                MainContent = new Container
+                dragContainer = new DragContainer(this)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                }.WithChild(MainContent = new Container
                 {
                     CornerRadius = 6,
                     Masking = true,
@@ -144,7 +153,7 @@ namespace osu.Game.Overlays.Notifications
                             Blending = BlendingParameters.Additive,
                         },
                     }
-                }
+                })
             };
         }
 
@@ -213,11 +222,126 @@ namespace osu.Game.Overlays.Notifications
 
             WasClosed = true;
 
-            Closed?.Invoke();
-            this.FadeOut(100);
+            if (dragContainer.FlingLeft())
+            {
+                Light.FadeOut(100);
+                this.FadeOut(600, Easing.In);
+            }
+            else
+            {
+                Closed?.Invoke();
+                this.FadeOut(100);
+            }
+
             Expire();
         }
 
+        private class DragContainer : Container
+        {
+            private Vector2 velocity;
+            private Vector2 lastPosition;
+
+            private readonly Notification notification;
+
+            public DragContainer(Notification notification)
+            {
+                this.notification = notification;
+                notification.Closed += () => FlingLeft();
+            }
+
+            public override RectangleF BoundingBox
+            {
+                get
+                {
+                    var childBounding = Children.First().BoundingBox;
+
+                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 800)));
+                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 800)));
+
+                    return childBounding;
+                }
+            }
+
+            protected override bool OnDragStart(DragStartEvent e) => true;
+
+            protected override void OnDrag(DragEvent e)
+            {
+                Vector2 change = e.MousePosition - e.MouseDownPosition;
+
+                // Diminish the drag distance as we go further to simulate "rubber band" feeling.
+                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.9f) / change.Length;
+
+                // Only apply Y change if dragging to the left.
+                if (change.X > 0)
+                    change.Y = 0;
+
+                this.MoveTo(change);
+            }
+
+            protected override void OnDragEnd(DragEndEvent e)
+            {
+                if (Rotation < -10 || velocity.X < -0.3f)
+                {
+                    FlingLeft();
+                }
+                else
+                {
+                    this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
+                    this.RotateTo(0, 800, Easing.OutElastic);
+                }
+
+                base.OnDragEnd(e);
+            }
+
+            private bool flinging;
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                Rotation = Math.Min(0, X * 0.1f);
+
+                if (flinging)
+                {
+                    velocity.Y += (float)Clock.ElapsedFrameTime * 0.005f;
+                    Position += (float)Clock.ElapsedFrameTime * velocity;
+                }
+                else
+                {
+                    Vector2 change = (Position - lastPosition) / (float)Clock.ElapsedFrameTime;
+
+                    if (velocity.X == 0)
+                        velocity = change;
+                    else
+                    {
+                        velocity = new Vector2(
+                            (float)Interpolation.DampContinuously(velocity.X, change.X, 40, Clock.ElapsedFrameTime),
+                            (float)Interpolation.DampContinuously(velocity.Y, change.Y, 40, Clock.ElapsedFrameTime)
+                        );
+                    }
+
+                    lastPosition = Position;
+                }
+            }
+
+            public bool FlingLeft()
+            {
+                if (this.FindClosestParent<NotificationOverlayToastTray>() == null)
+                    return false;
+
+                if (flinging)
+                    return true;
+
+                if (velocity.X > -0.3f)
+                    velocity.X = -0.3f - 0.5f * RNG.NextSingle();
+
+                flinging = true;
+                ClearTransforms();
+                notification.Close();
+                return true;
+            }
+        }
+
         internal class CloseButton : OsuClickableContainer
         {
             private SpriteIcon icon = null!;

From b5a2f7003e0d0770c53c775a36a2a24a893be05a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:34:35 +0900
Subject: [PATCH 241/709] Disallow flinging when not in toast state

---
 osu.Game/Overlays/NotificationOverlay.cs        | 5 +++++
 osu.Game/Overlays/Notifications/Notification.cs | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index b170ea5dfa..708bd4874d 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -158,7 +158,10 @@ namespace osu.Game.Overlays
             playDebouncedSample(notification.PopInSampleName);
 
             if (State.Value == Visibility.Hidden)
+            {
+                notification.IsInTray = true;
                 toastTray.Post(notification);
+            }
             else
                 addPermanently(notification);
 
@@ -167,6 +170,8 @@ namespace osu.Game.Overlays
 
         private void addPermanently(Notification notification)
         {
+            notification.IsInTray = false;
+
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 3e7bd0ab2f..595cff4171 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,6 +68,11 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        /// <summary>
+        /// Whether this notification is in the <see cref="NotificationOverlayToastTray"/>.
+        /// </summary>
+        public bool IsInTray { get; set; }
+
         private readonly Box initialFlash;
 
         private Box background = null!;
@@ -262,7 +267,7 @@ namespace osu.Game.Overlays.Notifications
                 }
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => true;
+            protected override bool OnDragStart(DragStartEvent e) => notification.IsInTray;
 
             protected override void OnDrag(DragEvent e)
             {
@@ -326,7 +331,7 @@ namespace osu.Game.Overlays.Notifications
 
             public bool FlingLeft()
             {
-                if (this.FindClosestParent<NotificationOverlayToastTray>() == null)
+                if (!notification.IsInTray)
                     return false;
 
                 if (flinging)

From a56cadcf9057278f2aa3735a79385e0c2c097239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 21:52:19 +0900
Subject: [PATCH 242/709] Ensure drag position is reset when transferred to
 tray

---
 osu.Game/Overlays/NotificationOverlay.cs      |  4 +--
 .../Overlays/Notifications/Notification.cs    | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 708bd4874d..15573f99af 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Overlays
 
             if (State.Value == Visibility.Hidden)
             {
-                notification.IsInTray = true;
+                notification.IsInToastTray = true;
                 toastTray.Post(notification);
             }
             else
@@ -170,7 +170,7 @@ namespace osu.Game.Overlays
 
         private void addPermanently(Notification notification)
         {
-            notification.IsInTray = false;
+            notification.IsInToastTray = false;
 
             var ourType = notification.GetType();
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 595cff4171..ded3c1606a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,10 +68,21 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        private bool isInToastTray;
+
         /// <summary>
         /// Whether this notification is in the <see cref="NotificationOverlayToastTray"/>.
         /// </summary>
-        public bool IsInTray { get; set; }
+        public bool IsInToastTray
+        {
+            private get => isInToastTray;
+            set
+            {
+                isInToastTray = value;
+                if (!isInToastTray)
+                    dragContainer.ResetPosition();
+            }
+        }
 
         private readonly Box initialFlash;
 
@@ -267,10 +278,13 @@ namespace osu.Game.Overlays.Notifications
                 }
             }
 
-            protected override bool OnDragStart(DragStartEvent e) => notification.IsInTray;
+            protected override bool OnDragStart(DragStartEvent e) => notification.IsInToastTray;
 
             protected override void OnDrag(DragEvent e)
             {
+                if (!notification.IsInToastTray)
+                    return;
+
                 Vector2 change = e.MousePosition - e.MouseDownPosition;
 
                 // Diminish the drag distance as we go further to simulate "rubber band" feeling.
@@ -286,14 +300,9 @@ namespace osu.Game.Overlays.Notifications
             protected override void OnDragEnd(DragEndEvent e)
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
-                {
                     FlingLeft();
-                }
                 else
-                {
-                    this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
-                    this.RotateTo(0, 800, Easing.OutElastic);
-                }
+                    ResetPosition();
 
                 base.OnDragEnd(e);
             }
@@ -331,7 +340,7 @@ namespace osu.Game.Overlays.Notifications
 
             public bool FlingLeft()
             {
-                if (!notification.IsInTray)
+                if (!notification.IsInToastTray)
                     return false;
 
                 if (flinging)
@@ -345,6 +354,12 @@ namespace osu.Game.Overlays.Notifications
                 notification.Close();
                 return true;
             }
+
+            public void ResetPosition()
+            {
+                this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
+                this.RotateTo(0, 800, Easing.OutElastic);
+            }
         }
 
         internal class CloseButton : OsuClickableContainer

From 9ef23c79ced4e8ca705bec6ba20505a216791312 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 11 Sep 2022 22:05:44 +0900
Subject: [PATCH 243/709] Disallow forwarding during a drag operation

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index 40324963fc..e4d3864beb 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Overlays
                     return;
 
                 // Notification hovered; delay dismissal.
-                if (notification.IsHovered)
+                if (notification.IsHovered || notification.IsDragged)
                 {
                     scheduleDismissal();
                     return;

From bb3d5bc9f4d8b5c47ec2c833fd59a985c90264e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 12 Sep 2022 04:43:15 +0900
Subject: [PATCH 244/709] test(osu.Game): add slider steps to change the size
 in timing distribution graph tests

---
 .../TestSceneHitEventTimingDistributionGraph.cs     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 198be4035b..e014d79402 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
@@ -19,14 +20,24 @@ namespace osu.Game.Tests.Visual.Ranking
     public class TestSceneHitEventTimingDistributionGraph : OsuTestScene
     {
         private HitEventTimingDistributionGraph graph = null!;
+        private readonly BindableFloat width = new BindableFloat(600);
+        private readonly BindableFloat height = new BindableFloat(130);
 
         private static readonly HitObject placeholder_object = new HitCircle();
 
+        public TestSceneHitEventTimingDistributionGraph()
+        {
+            width.BindValueChanged(e => graph.Width = e.NewValue);
+            height.BindValueChanged(e => graph.Height = e.NewValue);
+        }
+
         [Test]
         public void TestManyDistributedEvents()
         {
             createTest(CreateDistributedHitEvents());
             AddStep("add adjustment", () => graph.UpdateOffset(10));
+            AddSliderStep("width", 0.0f, 1000.0f, width.Value, width.Set);
+            AddSliderStep("height", 0.0f, 1000.0f, height.Value, height.Set);
         }
 
         [Test]
@@ -137,7 +148,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(600, 130)
+                    Size = new Vector2(width.Value, height.Value)
                 }
             };
         });

From ac324c63e2d0e3f0e9293519b6728aa7d415f90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 12 Sep 2022 04:46:32 +0900
Subject: [PATCH 245/709] fix(osu.Game): handle size changes in timing
 distribution graph

---
 .../HitEventTimingDistributionGraph.cs        | 83 ++++++++++++++-----
 1 file changed, 63 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 5335d77243..72603fd46b 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -209,13 +210,12 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         private class Bar : CompositeDrawable
         {
-            private float totalValue => values.Sum(v => v.Value);
-            private float basalHeight => BoundingBox.Width / BoundingBox.Height;
-            private float availableHeight => 1 - basalHeight;
-
             private readonly IReadOnlyList<KeyValuePair<HitResult, int>> values;
             private readonly float maxValue;
             private readonly bool isCentre;
+            private readonly float totalValue;
+            private readonly BindableFloat basalHeight;
+            private readonly BindableFloat offsetAdjustment;
 
             private Circle[] boxOriginals;
             private Circle boxAdjustment;
@@ -228,6 +228,9 @@ namespace osu.Game.Screens.Ranking.Statistics
                 this.values = values.OrderBy(v => v.Key.GetIndexForOrderedDisplay()).ToList();
                 this.maxValue = maxValue;
                 this.isCentre = isCentre;
+                totalValue = values.Sum(v => v.Value);
+                basalHeight = new BindableFloat();
+                offsetAdjustment = new BindableFloat(totalValue);
 
                 RelativeSizeAxes = Axes.Both;
                 Masking = true;
@@ -254,38 +257,70 @@ namespace osu.Game.Screens.Ranking.Statistics
                 else
                 {
                     // A bin with no value draws a grey dot instead.
-                    InternalChildren = boxOriginals = new[]
+                    Circle dot = new Circle
                     {
-                        new Circle
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Anchor = Anchor.BottomCentre,
-                            Origin = Anchor.BottomCentre,
-                            Colour = isCentre ? Color4.White : Color4.Gray,
-                            Height = 0,
-                        },
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Colour = isCentre ? Color4.White : Color4.Gray,
+                        Height = 0,
                     };
+                    InternalChildren = boxOriginals = new[] { dot };
+                    basalHeight.BindValueChanged(e => dot.Height = e.NewValue);
                 }
+
+                offsetAdjustment.BindValueChanged(_ => drawAdjustmentBar());
             }
 
             private const double duration = 300;
 
-            private float offsetForValue(float value)
+            private float calculateBasalHeight() => DrawHeight == 0 ? 0 : DrawWidth / DrawHeight;
+
+            private float offsetForValue(float value) => (1 - basalHeight.Value) * value / maxValue;
+
+            private float heightForValue(float value) => MathF.Max(basalHeight.Value + offsetForValue(value), 0);
+
+            private void draw()
             {
-                return availableHeight * value / maxValue;
+                resizeBars();
+
+                if (boxAdjustment != null)
+                    drawAdjustmentBar();
             }
 
-            private float heightForValue(float value)
+            private void resizeBars()
             {
-                return basalHeight + offsetForValue(value);
+                float offsetValue = 0;
+
+                for (int i = 0; i < values.Count; i++)
+                {
+                    boxOriginals[i].Y = offsetForValue(offsetValue) * BoundingBox.Height;
+                    boxOriginals[i].Height = heightForValue(values[i].Value);
+                    offsetValue -= values[i].Value;
+                }
+            }
+
+            private void drawAdjustmentBar()
+            {
+                bool hasAdjustment = offsetAdjustment.Value != totalValue;
+
+                boxAdjustment.ResizeHeightTo(heightForValue(offsetAdjustment.Value), duration, Easing.OutQuint);
+                boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
+                float height = calculateBasalHeight();
+
+                basalHeight.Set(height);
+
+                if (!values.Any())
+                    return;
+
                 foreach (var boxOriginal in boxOriginals)
-                    boxOriginal.Height = basalHeight;
+                    boxOriginal.Height = height;
 
                 float offsetValue = 0;
 
@@ -295,6 +330,15 @@ namespace osu.Game.Screens.Ranking.Statistics
                     boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
                     offsetValue -= values[i].Value;
                 }
+
+                basalHeight.BindValueChanged(_ => draw());
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                basalHeight.Set(calculateBasalHeight());
             }
 
             public void UpdateOffset(float adjustment)
@@ -318,8 +362,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                     });
                 }
 
-                boxAdjustment.ResizeHeightTo(heightForValue(adjustment), duration, Easing.OutQuint);
-                boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
+                offsetAdjustment.Set(adjustment);
             }
         }
     }

From 24138b65a74c1d57a2267dce3510f01442a3fabb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:05:16 +0900
Subject: [PATCH 246/709] Fix storyboard animations not starting their
 animation playback from the correct point in time

---
 .../Drawables/DrawableStoryboardAnimation.cs     | 16 ++++++++++++++++
 osu.Game/Storyboards/StoryboardSprite.cs         | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index f3187d77b7..369a3ee7ba 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -115,6 +116,21 @@ namespace osu.Game.Storyboards.Drawables
             Animation.ApplyTransforms(this);
         }
 
+        [Resolved]
+        private IGameplayClock gameplayClock { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Framework animation class tries its best to synchronise the animation at LoadComplete,
+            // but in some cases (such as fast forward) this results in an incorrect start offset.
+            //
+            // In the case of storyboard animations, we want to synchronise with game time perfectly
+            // so let's get a correct time based on gameplay clock and earliest transform.
+            PlaybackPosition = gameplayClock.CurrentTime - Animation.EarliestTransformTime;
+        }
+
         private void skinSourceChanged()
         {
             ClearFrames();
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 1eeaa0f084..589bcb60be 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Storyboards
 
         public readonly CommandTimelineGroup TimelineGroup = new CommandTimelineGroup();
 
-        public double StartTime
+        public virtual double StartTime
         {
             get
             {
@@ -54,6 +54,14 @@ namespace osu.Game.Storyboards
                         return firstAlpha.startTime;
                 }
 
+                return EarliestTransformTime;
+            }
+        }
+
+        public double EarliestTransformTime
+        {
+            get
+            {
                 // If we got to this point, either no alpha commands were present, or the earliest had a non-zero start value.
                 // The sprite's StartTime will be determined by the earliest command, regardless of type.
                 double earliestStartTime = TimelineGroup.StartTime;

From cf25ee8e8482b5c60fb6fd8b8f0d7e23fcf903d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:17:15 +0900
Subject: [PATCH 247/709] Add test coverage of storyboard animation start time

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 19 +++++++++++++++++++
 .../animation-starts-before-alpha.osb         |  5 +++++
 2 files changed, 24 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/animation-starts-before-alpha.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 6e41043b0b..d9e80fa111 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -97,6 +97,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestCorrectAnimationStartTime()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("animation-starts-before-alpha.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
+                Assert.AreEqual(1, background.Elements.Count);
+
+                Assert.AreEqual(2000, background.Elements[0].StartTime);
+                // This property should be used in DrawableStoryboardAnimation as a starting point for animation playback.
+                Assert.AreEqual(1000, (background.Elements[0] as StoryboardAnimation)?.EarliestTransformTime);
+            }
+        }
+
         [Test]
         public void TestOutOfOrderStartTimes()
         {
diff --git a/osu.Game.Tests/Resources/animation-starts-before-alpha.osb b/osu.Game.Tests/Resources/animation-starts-before-alpha.osb
new file mode 100644
index 0000000000..ceef204f3f
--- /dev/null
+++ b/osu.Game.Tests/Resources/animation-starts-before-alpha.osb
@@ -0,0 +1,5 @@
+[Events]
+//Storyboard Layer 0 (Background)
+Animation,Background,Centre,"img.jpg",320,240,2,150,LoopForever
+ S,0,1000,1500,0.08 // animation should start playing from this point in time..
+ F,0,2000,,0,1      // .. not this point in time

From bbf906ee064507157512ba692962707a4c682b1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:20:48 +0900
Subject: [PATCH 248/709] Remove unnecessary `virtual` spec

---
 osu.Game/Storyboards/StoryboardSprite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 589bcb60be..cd7788bb08 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Storyboards
 
         public readonly CommandTimelineGroup TimelineGroup = new CommandTimelineGroup();
 
-        public virtual double StartTime
+        public double StartTime
         {
             get
             {

From eca241e9a71943f45b0226b02ea645c1790751e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:52:11 +0900
Subject: [PATCH 249/709] Move `UpdateProgressNotification` to base
 `UpdateManager` class

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs | 112 ++++++-------------
 osu.Game/Updater/UpdateManager.cs            |  72 +++++++++++-
 2 files changed, 99 insertions(+), 85 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 6f45237522..84bac9da7c 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -5,26 +5,24 @@ using System;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Logging;
 using osu.Game;
-using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osuTK;
 using Squirrel;
 using Squirrel.SimpleSplat;
+using LogLevel = Squirrel.SimpleSplat.LogLevel;
+using UpdateManager = osu.Game.Updater.UpdateManager;
 
 namespace osu.Desktop.Updater
 {
     [SupportedOSPlatform("windows")]
-    public class SquirrelUpdateManager : osu.Game.Updater.UpdateManager
+    public class SquirrelUpdateManager : UpdateManager
     {
-        private UpdateManager? updateManager;
+        private Squirrel.UpdateManager? updateManager;
         private INotificationOverlay notificationOverlay = null!;
 
-        public Task PrepareUpdateAsync() => UpdateManager.RestartAppWhenExited();
+        public Task PrepareUpdateAsync() => Squirrel.UpdateManager.RestartAppWhenExited();
 
         private static readonly Logger logger = Logger.GetLogger("updater");
 
@@ -35,6 +33,9 @@ namespace osu.Desktop.Updater
 
         private readonly SquirrelLogger squirrelLogger = new SquirrelLogger();
 
+        [Resolved]
+        private OsuGameBase game { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load(INotificationOverlay notifications)
         {
@@ -63,7 +64,14 @@ namespace osu.Desktop.Updater
                     if (updatePending)
                     {
                         // the user may have dismissed the completion notice, so show it again.
-                        notificationOverlay.Post(new UpdateCompleteNotification(this));
+                        notificationOverlay.Post(new UpdateApplicationCompleteNotification
+                        {
+                            Activated = () =>
+                            {
+                                restartToApplyUpdate();
+                                return true;
+                            },
+                        });
                         return true;
                     }
 
@@ -75,19 +83,21 @@ namespace osu.Desktop.Updater
 
                 if (notification == null)
                 {
-                    notification = new UpdateProgressNotification(this) { State = ProgressNotificationState.Active };
+                    notification = new UpdateProgressNotification
+                    {
+                        CompletionClickAction = restartToApplyUpdate,
+                    };
+
                     Schedule(() => notificationOverlay.Post(notification));
                 }
 
-                notification.Progress = 0;
-                notification.Text = @"Downloading update...";
+                notification.StartDownload();
 
                 try
                 {
                     await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
-                    notification.Progress = 0;
-                    notification.Text = @"Installing update...";
+                    notification.StartInstall();
 
                     await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
@@ -107,9 +117,7 @@ namespace osu.Desktop.Updater
                     else
                     {
                         // In the case of an error, a separate notification will be displayed.
-                        notification.State = ProgressNotificationState.Cancelled;
-                        notification.Close();
-
+                        notification.FailDownload();
                         Logger.Error(e, @"update failed!");
                     }
                 }
@@ -131,78 +139,24 @@ namespace osu.Desktop.Updater
             return true;
         }
 
+        private bool restartToApplyUpdate()
+        {
+            PrepareUpdateAsync()
+                .ContinueWith(_ => Schedule(() => game.AttemptExit()));
+            return true;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             updateManager?.Dispose();
         }
 
-        private class UpdateCompleteNotification : ProgressCompletionNotification
-        {
-            [Resolved]
-            private OsuGame game { get; set; } = null!;
-
-            public UpdateCompleteNotification(SquirrelUpdateManager updateManager)
-            {
-                Text = @"Update ready to install. Click to restart!";
-
-                Activated = () =>
-                {
-                    updateManager.PrepareUpdateAsync()
-                                 .ContinueWith(_ => updateManager.Schedule(() => game.AttemptExit()));
-                    return true;
-                };
-            }
-        }
-
-        private class UpdateProgressNotification : ProgressNotification
-        {
-            private readonly SquirrelUpdateManager updateManager;
-
-            public UpdateProgressNotification(SquirrelUpdateManager updateManager)
-            {
-                this.updateManager = updateManager;
-            }
-
-            protected override Notification CreateCompletionNotification()
-            {
-                return new UpdateCompleteNotification(updateManager);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                IconContent.AddRange(new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Upload,
-                        Size = new Vector2(20),
-                    }
-                });
-            }
-
-            public override void Close()
-            {
-                // cancelling updates is not currently supported by the underlying updater.
-                // only allow dismissing for now.
-
-                switch (State)
-                {
-                    case ProgressNotificationState.Cancelled:
-                        base.Close();
-                        break;
-                }
-            }
-        }
-
         private class SquirrelLogger : ILogger, IDisposable
         {
-            public Squirrel.SimpleSplat.LogLevel Level { get; set; } = Squirrel.SimpleSplat.LogLevel.Info;
+            public LogLevel Level { get; set; } = LogLevel.Info;
 
-            public void Write(string message, Squirrel.SimpleSplat.LogLevel logLevel)
+            public void Write(string message, LogLevel logLevel)
             {
                 if (logLevel < Level)
                     return;
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 4790055cd1..801f2daac5 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -1,16 +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.
 
-#nullable disable
-
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osuTK;
 
 namespace osu.Game.Updater
 {
@@ -27,13 +27,13 @@ namespace osu.Game.Updater
                                          GetType() != typeof(UpdateManager);
 
         [Resolved]
-        private OsuConfigManager config { get; set; }
+        private OsuConfigManager config { get; set; } = null!;
 
         [Resolved]
-        private OsuGameBase game { get; set; }
+        private OsuGameBase game { get; set; } = null!;
 
         [Resolved]
-        protected INotificationOverlay Notifications { get; private set; }
+        protected INotificationOverlay Notifications { get; private set; } = null!;
 
         protected override void LoadComplete()
         {
@@ -59,7 +59,7 @@ namespace osu.Game.Updater
 
         private readonly object updateTaskLock = new object();
 
-        private Task<bool> updateCheckTask;
+        private Task<bool>? updateCheckTask;
 
         public async Task<bool> CheckForUpdateAsync()
         {
@@ -109,5 +109,65 @@ namespace osu.Game.Updater
                 };
             }
         }
+
+        protected class UpdateApplicationCompleteNotification : ProgressCompletionNotification
+        {
+            public UpdateApplicationCompleteNotification()
+            {
+                Text = @"Update ready to install. Click to restart!";
+            }
+        }
+
+        public class UpdateProgressNotification : ProgressNotification
+        {
+            protected override Notification CreateCompletionNotification() => new UpdateApplicationCompleteNotification();
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                IconContent.AddRange(new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Icon = FontAwesome.Solid.Upload,
+                        Size = new Vector2(14),
+                    }
+                });
+            }
+
+            public override void Close()
+            {
+                // cancelling updates is not currently supported by the underlying updater.
+                // only allow dismissing for now.
+
+                switch (State)
+                {
+                    case ProgressNotificationState.Cancelled:
+                        base.Close();
+                        break;
+                }
+            }
+
+            public void StartDownload()
+            {
+                State = ProgressNotificationState.Active;
+                Progress = 0;
+                Text = @"Downloading update...";
+            }
+
+            public void StartInstall()
+            {
+                Progress = 0;
+                Text = @"Installing update...";
+            }
+
+            public void FailDownload()
+            {
+                State = ProgressNotificationState.Cancelled;
+                Close();
+            }
+        }
     }
 }

From 2b79e6b2de20e64cd984c4bb8c5878bc28bdb10e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:52:16 +0900
Subject: [PATCH 250/709] Add test coverage of update notification

---
 .../TestSceneNotificationOverlay.cs           | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 699b8f7d89..1afe8327b3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -12,6 +12,7 @@ using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Updater;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -134,6 +135,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("cancel notification", () => notification.State = ProgressNotificationState.Cancelled);
         }
 
+        [Test]
+        public void TestUpdateNotificationFlow()
+        {
+            bool applyUpdate = false;
+
+            AddStep(@"post update", () =>
+            {
+                applyUpdate = false;
+
+                var updateNotification = new UpdateManager.UpdateProgressNotification
+                {
+                    CompletionClickAction = () => applyUpdate = true
+                };
+
+                notificationOverlay.Post(updateNotification);
+                progressingNotifications.Add(updateNotification);
+            });
+
+            checkProgressingCount(1);
+            waitForCompletion();
+            AddStep("click notification", () => notificationOverlay.ChildrenOfType<Notification>().Single().TriggerClick());
+
+            AddUntilStep("wait for update applied", () => applyUpdate);
+        }
+
         [Test]
         public void TestBasicFlow()
         {

From 60b0b909a51d1986956cddbf56a6927f1025b649 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 14:58:46 +0900
Subject: [PATCH 251/709] Move update icon to background to avoid colour
 collission with progress spinner

---
 .../Overlays/Notifications/ProgressNotification.cs     |  1 +
 osu.Game/Updater/UpdateManager.cs                      | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 64ad69adf3..bdf6f704e5 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -226,6 +226,7 @@ namespace osu.Game.Overlays.Notifications
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background5,
+                    Depth = float.MaxValue,
                 },
                 loadingSpinner = new LoadingSpinner
                 {
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 801f2daac5..8dcb1c4562 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -132,11 +132,19 @@ namespace osu.Game.Updater
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Icon = FontAwesome.Solid.Upload,
-                        Size = new Vector2(14),
+                        Size = new Vector2(34),
+                        Colour = OsuColour.Gray(0.2f),
+                        Depth = float.MaxValue,
                     }
                 });
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                StartDownload();
+            }
+
             public override void Close()
             {
                 // cancelling updates is not currently supported by the underlying updater.

From 9b31aa6d7ace1a41888315f0bdcfc06ebf86c01a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:04:30 +0900
Subject: [PATCH 252/709] Fix activation not firing with refactors

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs   | 6 +++++-
 osu.Game/Updater/UpdateManager.cs                          | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 1afe8327b3..f497a5bd6b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -155,7 +155,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             checkProgressingCount(1);
             waitForCompletion();
-            AddStep("click notification", () => notificationOverlay.ChildrenOfType<Notification>().Single().TriggerClick());
+
+            UpdateManager.UpdateApplicationCompleteNotification? completionNotification = null;
+            AddUntilStep("wait for completion notification",
+                () => (completionNotification = notificationOverlay.ChildrenOfType<UpdateManager.UpdateApplicationCompleteNotification>().SingleOrDefault()) != null);
+            AddStep("click notification", () => completionNotification?.TriggerClick());
 
             AddUntilStep("wait for update applied", () => applyUpdate);
         }
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 8dcb1c4562..49009e9124 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Updater
             }
         }
 
-        protected class UpdateApplicationCompleteNotification : ProgressCompletionNotification
+        public class UpdateApplicationCompleteNotification : ProgressCompletionNotification
         {
             public UpdateApplicationCompleteNotification()
             {
@@ -120,7 +120,10 @@ namespace osu.Game.Updater
 
         public class UpdateProgressNotification : ProgressNotification
         {
-            protected override Notification CreateCompletionNotification() => new UpdateApplicationCompleteNotification();
+            protected override Notification CreateCompletionNotification() => new UpdateApplicationCompleteNotification
+            {
+                Activated = CompletionClickAction
+            };
 
             [BackgroundDependencyLoader]
             private void load()

From 92beb6cbe740336ab84e920818bb4fe5b372563f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:16:45 +0900
Subject: [PATCH 253/709] Hide notification read light when in a toast state

Also adds test coverage of read state and light.
---
 .../TestSceneNotificationOverlay.cs           | 20 +++++++++++++++++++
 .../Overlays/Notifications/Notification.cs    | 11 ++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 5f82a0024b..6b737b7f5f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -219,6 +219,26 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("cancel notification", () => notification.State = ProgressNotificationState.Cancelled);
         }
 
+        [Test]
+        public void TestReadState()
+        {
+            SimpleNotification notification = null!;
+            AddStep(@"post", () => notificationOverlay.Post(notification = new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" }));
+            AddUntilStep("check is toast", () => !notification.IsInToastTray);
+            AddAssert("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
+
+            AddUntilStep("wait for forward to overlay", () => !notification.IsInToastTray);
+
+            setState(Visibility.Visible);
+            AddAssert("state is not read", () => !notification.Read);
+            AddUntilStep("light is visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 1);
+
+            setState(Visibility.Hidden);
+            setState(Visibility.Visible);
+            AddAssert("state is read", () => notification.Read);
+            AddUntilStep("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
+        }
+
         [Test]
         public void TestBasicFlow()
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index ded3c1606a..91f5f3b19b 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -75,12 +75,17 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public bool IsInToastTray
         {
-            private get => isInToastTray;
+            get => isInToastTray;
             set
             {
                 isInToastTray = value;
+
                 if (!isInToastTray)
+                {
                     dragContainer.ResetPosition();
+                    if (!Read)
+                        Light.FadeIn(100);
+                }
             }
         }
 
@@ -97,6 +102,7 @@ namespace osu.Game.Overlays.Notifications
             {
                 Light = new NotificationLight
                 {
+                    Alpha = 0,
                     Margin = new MarginPadding { Right = 5 },
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreRight,
@@ -239,10 +245,7 @@ namespace osu.Game.Overlays.Notifications
             WasClosed = true;
 
             if (dragContainer.FlingLeft())
-            {
-                Light.FadeOut(100);
                 this.FadeOut(600, Easing.In);
-            }
             else
             {
                 Closed?.Invoke();

From e06a0f7300fc9cb71b7a9914a1f8143481a57790 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:21:01 +0900
Subject: [PATCH 254/709] Fix dragged state not being exposed correctly

---
 osu.Game/Overlays/Notifications/Notification.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 91f5f3b19b..248d66ac16 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Overlays.Notifications
 
         public virtual bool Read { get; set; }
 
+        public new bool IsDragged => dragContainer.IsDragged;
+
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
 
         [Resolved]

From 2476cf8fb36e4e964b397d86ae082a0ab1de6149 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:37:48 +0900
Subject: [PATCH 255/709] Adjust movement to look less sudden when snapping
 back to Y=0

---
 osu.Game/Overlays/Notifications/Notification.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 248d66ac16..2e4b0c430a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -293,11 +293,13 @@ namespace osu.Game.Overlays.Notifications
                 Vector2 change = e.MousePosition - e.MouseDownPosition;
 
                 // Diminish the drag distance as we go further to simulate "rubber band" feeling.
-                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.9f) / change.Length;
+                change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.8f) / change.Length;
 
                 // Only apply Y change if dragging to the left.
-                if (change.X > 0)
+                if (change.X >= 0)
                     change.Y = 0;
+                else
+                    change.Y *= (float)Interpolation.ApplyEasing(Easing.InOutQuart, Math.Min(1, -change.X / 200));
 
                 this.MoveTo(change);
             }

From 0755289ec3cfce14b47250baffabbbcacb76203e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:48:50 +0900
Subject: [PATCH 256/709] Apply NRT to `HitEventTimingDistributionGraph`

---
 .../HitEventTimingDistributionGraph.cs        | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 72603fd46b..930a702958 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -48,6 +46,12 @@ namespace osu.Game.Screens.Ranking.Statistics
         /// </summary>
         private readonly IReadOnlyList<HitEvent> hitEvents;
 
+        private readonly IDictionary<HitResult, int>[] bins;
+        private double binSize;
+        private double hitOffset;
+
+        private Bar[]? barDrawables;
+
         /// <summary>
         /// Creates a new <see cref="HitEventTimingDistributionGraph"/>.
         /// </summary>
@@ -55,22 +59,15 @@ namespace osu.Game.Screens.Ranking.Statistics
         public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
         {
             this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
+            bins = Enumerable.Range(0, total_timing_distribution_bins).Select(_ => new Dictionary<HitResult, int>()).ToArray<IDictionary<HitResult, int>>();
         }
 
-        private IDictionary<HitResult, int>[] bins;
-        private double binSize;
-        private double hitOffset;
-
-        private Bar[] barDrawables;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (hitEvents == null || hitEvents.Count == 0)
+            if (hitEvents.Count == 0)
                 return;
 
-            bins = Enumerable.Range(0, total_timing_distribution_bins).Select(_ => new Dictionary<HitResult, int>()).ToArray<IDictionary<HitResult, int>>();
-
             binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins);
 
             // Prevent div-by-0 by enforcing a minimum bin size
@@ -217,11 +214,12 @@ namespace osu.Game.Screens.Ranking.Statistics
             private readonly BindableFloat basalHeight;
             private readonly BindableFloat offsetAdjustment;
 
-            private Circle[] boxOriginals;
-            private Circle boxAdjustment;
+            private Circle[] boxOriginals = null!;
+
+            private Circle? boxAdjustment;
 
             [Resolved]
-            private OsuColour colours { get; set; }
+            private OsuColour colours { get; set; } = null!;
 
             public Bar(IDictionary<HitResult, int> values, float maxValue, bool isCentre)
             {

From bcd2445d9b7a91d9e870cde3d3db5b505ca94a21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:50:10 +0900
Subject: [PATCH 257/709] Move helper functions down in file

---
 .../HitEventTimingDistributionGraph.cs        | 115 +++++++++---------
 1 file changed, 57 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 930a702958..8ef85d24c4 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -221,6 +221,8 @@ namespace osu.Game.Screens.Ranking.Statistics
             [Resolved]
             private OsuColour colours { get; set; } = null!;
 
+            private const double duration = 300;
+
             public Bar(IDictionary<HitResult, int> values, float maxValue, bool isCentre)
             {
                 this.values = values.OrderBy(v => v.Key.GetIndexForOrderedDisplay()).ToList();
@@ -270,7 +272,61 @@ namespace osu.Game.Screens.Ranking.Statistics
                 offsetAdjustment.BindValueChanged(_ => drawAdjustmentBar());
             }
 
-            private const double duration = 300;
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                float height = calculateBasalHeight();
+
+                basalHeight.Value = height;
+
+                if (!values.Any())
+                    return;
+
+                foreach (var boxOriginal in boxOriginals)
+                    boxOriginal.Height = height;
+
+                float offsetValue = 0;
+
+                for (int i = 0; i < values.Count; i++)
+                {
+                    boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
+                    boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
+                    offsetValue -= values[i].Value;
+                }
+
+                basalHeight.BindValueChanged(_ => draw());
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                basalHeight.Value = calculateBasalHeight();
+            }
+
+            public void UpdateOffset(float adjustment)
+            {
+                bool hasAdjustment = adjustment != totalValue;
+
+                if (boxAdjustment == null)
+                {
+                    if (!hasAdjustment)
+                        return;
+
+                    AddInternal(boxAdjustment = new Circle
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Colour = Color4.Yellow,
+                        Blending = BlendingParameters.Additive,
+                        Alpha = 0.6f,
+                        Height = 0,
+                    });
+                }
+
+                offsetAdjustment.Set(adjustment);
+            }
 
             private float calculateBasalHeight() => DrawHeight == 0 ? 0 : DrawWidth / DrawHeight;
 
@@ -305,63 +361,6 @@ namespace osu.Game.Screens.Ranking.Statistics
                 boxAdjustment.ResizeHeightTo(heightForValue(offsetAdjustment.Value), duration, Easing.OutQuint);
                 boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                float height = calculateBasalHeight();
-
-                basalHeight.Set(height);
-
-                if (!values.Any())
-                    return;
-
-                foreach (var boxOriginal in boxOriginals)
-                    boxOriginal.Height = height;
-
-                float offsetValue = 0;
-
-                for (int i = 0; i < values.Count; i++)
-                {
-                    boxOriginals[i].MoveToY(offsetForValue(offsetValue) * BoundingBox.Height, duration, Easing.OutQuint);
-                    boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
-                    offsetValue -= values[i].Value;
-                }
-
-                basalHeight.BindValueChanged(_ => draw());
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                basalHeight.Set(calculateBasalHeight());
-            }
-
-            public void UpdateOffset(float adjustment)
-            {
-                bool hasAdjustment = adjustment != totalValue;
-
-                if (boxAdjustment == null)
-                {
-                    if (!hasAdjustment)
-                        return;
-
-                    AddInternal(boxAdjustment = new Circle
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Colour = Color4.Yellow,
-                        Blending = BlendingParameters.Additive,
-                        Alpha = 0.6f,
-                        Height = 0,
-                    });
-                }
-
-                offsetAdjustment.Set(adjustment);
-            }
         }
     }
 }

From 96951057df199df099e61af0b4136cd1909ebe1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 15:56:06 +0900
Subject: [PATCH 258/709] Avoid using bindables

---
 .../HitEventTimingDistributionGraph.cs        | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 8ef85d24c4..ebf521ba21 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -211,8 +210,9 @@ namespace osu.Game.Screens.Ranking.Statistics
             private readonly float maxValue;
             private readonly bool isCentre;
             private readonly float totalValue;
-            private readonly BindableFloat basalHeight;
-            private readonly BindableFloat offsetAdjustment;
+
+            private float basalHeight;
+            private float offsetAdjustment;
 
             private Circle[] boxOriginals = null!;
 
@@ -229,8 +229,7 @@ namespace osu.Game.Screens.Ranking.Statistics
                 this.maxValue = maxValue;
                 this.isCentre = isCentre;
                 totalValue = values.Sum(v => v.Value);
-                basalHeight = new BindableFloat();
-                offsetAdjustment = new BindableFloat(totalValue);
+                offsetAdjustment = totalValue;
 
                 RelativeSizeAxes = Axes.Both;
                 Masking = true;
@@ -266,25 +265,20 @@ namespace osu.Game.Screens.Ranking.Statistics
                         Height = 0,
                     };
                     InternalChildren = boxOriginals = new[] { dot };
-                    basalHeight.BindValueChanged(e => dot.Height = e.NewValue);
                 }
-
-                offsetAdjustment.BindValueChanged(_ => drawAdjustmentBar());
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
-                float height = calculateBasalHeight();
-
-                basalHeight.Value = height;
-
                 if (!values.Any())
                     return;
 
+                updateBasalHeight();
+
                 foreach (var boxOriginal in boxOriginals)
-                    boxOriginal.Height = height;
+                    boxOriginal.Height = basalHeight;
 
                 float offsetValue = 0;
 
@@ -294,14 +288,12 @@ namespace osu.Game.Screens.Ranking.Statistics
                     boxOriginals[i].ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
                     offsetValue -= values[i].Value;
                 }
-
-                basalHeight.BindValueChanged(_ => draw());
             }
 
             protected override void Update()
             {
                 base.Update();
-                basalHeight.Value = calculateBasalHeight();
+                updateBasalHeight();
             }
 
             public void UpdateOffset(float adjustment)
@@ -325,14 +317,27 @@ namespace osu.Game.Screens.Ranking.Statistics
                     });
                 }
 
-                offsetAdjustment.Set(adjustment);
+                offsetAdjustment = adjustment;
+                drawAdjustmentBar();
             }
 
-            private float calculateBasalHeight() => DrawHeight == 0 ? 0 : DrawWidth / DrawHeight;
+            private void updateBasalHeight()
+            {
+                float newBasalHeight = DrawHeight == 0 ? 0 : DrawWidth / DrawHeight;
 
-            private float offsetForValue(float value) => (1 - basalHeight.Value) * value / maxValue;
+                if (newBasalHeight == basalHeight)
+                    return;
 
-            private float heightForValue(float value) => MathF.Max(basalHeight.Value + offsetForValue(value), 0);
+                basalHeight = newBasalHeight;
+                foreach (var dot in boxOriginals)
+                    dot.Height = basalHeight;
+
+                draw();
+            }
+
+            private float offsetForValue(float value) => (1 - basalHeight) * value / maxValue;
+
+            private float heightForValue(float value) => MathF.Max(basalHeight + offsetForValue(value), 0);
 
             private void draw()
             {
@@ -356,9 +361,9 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             private void drawAdjustmentBar()
             {
-                bool hasAdjustment = offsetAdjustment.Value != totalValue;
+                bool hasAdjustment = offsetAdjustment != totalValue;
 
-                boxAdjustment.ResizeHeightTo(heightForValue(offsetAdjustment.Value), duration, Easing.OutQuint);
+                boxAdjustment.ResizeHeightTo(heightForValue(offsetAdjustment), duration, Easing.OutQuint);
                 boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
             }
         }

From 94f8197e22f647d61ee82c42bee7d9dbd386d65c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:15:14 +0900
Subject: [PATCH 259/709] Show login overlay when attempting to update a
 beatmap while logged out

---
 .../Select/Carousel/UpdateBeatmapSetButton.cs | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
index 73e7d23df0..3c4ed4734b 100644
--- a/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
+++ b/osu.Game/Screens/Select/Carousel/UpdateBeatmapSetButton.cs
@@ -11,6 +11,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,6 +24,15 @@ namespace osu.Game.Screens.Select.Carousel
         private SpriteIcon icon = null!;
         private Box progressFill = null!;
 
+        [Resolved]
+        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved(canBeNull: true)]
+        private LoginOverlay? loginOverlay { get; set; }
+
         public UpdateBeatmapSetButton(BeatmapSetInfo beatmapSetInfo)
         {
             this.beatmapSetInfo = beatmapSetInfo;
@@ -32,9 +43,6 @@ namespace osu.Game.Screens.Select.Carousel
             Origin = Anchor.CentreLeft;
         }
 
-        [Resolved]
-        private BeatmapModelDownloader beatmapDownloader { get; set; } = null!;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -90,6 +98,12 @@ namespace osu.Game.Screens.Select.Carousel
 
             Action = () =>
             {
+                if (!api.IsLoggedIn)
+                {
+                    loginOverlay?.Show();
+                    return;
+                }
+
                 beatmapDownloader.DownloadAsUpdate(beatmapSetInfo);
                 attachExistingDownload();
             };

From 0d0e2e7bcce9445e9513cacb8281b03b8adf91be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 12 Sep 2022 16:20:33 +0900
Subject: [PATCH 260/709] fix(osu.Game): bars in hit distribution graph
 stretching in the opposite direction when `DrawHeight` is less than
 `DrawWidth`

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index ebf521ba21..5f3b2773ea 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -323,7 +323,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             private void updateBasalHeight()
             {
-                float newBasalHeight = DrawHeight == 0 ? 0 : DrawWidth / DrawHeight;
+                float newBasalHeight = DrawHeight > DrawWidth ? DrawWidth / DrawHeight : 1;
 
                 if (newBasalHeight == basalHeight)
                     return;
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
                 for (int i = 0; i < values.Count; i++)
                 {
-                    boxOriginals[i].Y = offsetForValue(offsetValue) * BoundingBox.Height;
+                    boxOriginals[i].Y = offsetForValue(offsetValue) * DrawHeight;
                     boxOriginals[i].Height = heightForValue(values[i].Value);
                     offsetValue -= values[i].Value;
                 }

From 4f298db066bba408f1aaaa8c5cfa76b29738cec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Mon, 12 Sep 2022 16:25:29 +0900
Subject: [PATCH 261/709] fix(osu.Game): reset Y axis of the bars in hit
 distribution graph at the first drawing

---
 .../Ranking/Statistics/HitEventTimingDistributionGraph.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 5f3b2773ea..764237ef96 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -278,7 +278,10 @@ namespace osu.Game.Screens.Ranking.Statistics
                 updateBasalHeight();
 
                 foreach (var boxOriginal in boxOriginals)
+                {
+                    boxOriginal.Y = 0;
                     boxOriginal.Height = basalHeight;
+                }
 
                 float offsetValue = 0;
 

From bd3673baa9fe9fa5c5b77659e270c1e784938191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:25:32 +0900
Subject: [PATCH 262/709] Fix being able to drag after already closing a
 notification

---
 osu.Game/Overlays/Notifications/Notification.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2e4b0c430a..facf43128d 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -70,6 +70,8 @@ namespace osu.Game.Overlays.Notifications
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; } = null!;
 
+        public override bool PropagatePositionalInputSubTree => base.PropagatePositionalInputSubTree && !WasClosed;
+
         private bool isInToastTray;
 
         /// <summary>
@@ -327,7 +329,7 @@ namespace osu.Game.Overlays.Notifications
                     velocity.Y += (float)Clock.ElapsedFrameTime * 0.005f;
                     Position += (float)Clock.ElapsedFrameTime * velocity;
                 }
-                else
+                else if (Clock.ElapsedFrameTime > 0)
                 {
                     Vector2 change = (Position - lastPosition) / (float)Clock.ElapsedFrameTime;
 

From a50617857176acbefb571e777429d9411cfdbff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:39:46 +0900
Subject: [PATCH 263/709] Make bounding box shrink faster to allow for rapid
 flinging

---
 osu.Game/Overlays/Notifications/Notification.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index facf43128d..f83be0c446 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -278,8 +278,8 @@ namespace osu.Game.Overlays.Notifications
                 {
                     var childBounding = Children.First().BoundingBox;
 
-                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 800)));
-                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 800)));
+                    if (X < 0) childBounding *= new Vector2(1, Math.Max(0, 1 + (X / 300)));
+                    if (Y > 0) childBounding *= new Vector2(1, Math.Max(0, 1 - (Y / 200)));
 
                     return childBounding;
                 }

From 5a02e1e7133e2be8f6eba967049b058a720957f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:46:45 +0900
Subject: [PATCH 264/709] Use padding instead of `FillFlow.Spacing` to avoid
 artifact during animation

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs      | 1 -
 osu.Game/Overlays/Notifications/Notification.cs        | 3 +++
 osu.Game/Overlays/Notifications/NotificationSection.cs | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index e4d3864beb..1da05dab75 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -78,7 +78,6 @@ namespace osu.Game.Overlays
                 {
                     LayoutDuration = 150,
                     LayoutEasing = Easing.OutQuart,
-                    Spacing = new Vector2(3),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index f83be0c446..fe2f67973a 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -113,6 +113,9 @@ namespace osu.Game.Overlays.Notifications
                 },
                 dragContainer = new DragContainer(this)
                 {
+                    // Use margin instead of FillFlow spacing to fix extra padding appearing when notification shrinks
+                    // in height.
+                    Padding = new MarginPadding { Vertical = 3f },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 }.WithChild(MainContent = new Container
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index d2e18a0cee..14bacca534 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -106,7 +106,6 @@ namespace osu.Game.Overlays.Notifications
                     RelativeSizeAxes = Axes.X,
                     LayoutDuration = 150,
                     LayoutEasing = Easing.OutQuart,
-                    Spacing = new Vector2(3),
                 }
             });
         }

From d561fcb126689dade097acce3f4f425504680fff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:54:25 +0900
Subject: [PATCH 265/709] Don't trigger fling animation when `Close` is
 triggered by non-user action

---
 .../Online/TestSceneBeatmapDownloading.cs           |  2 +-
 osu.Game/Database/ModelDownloader.cs                |  2 +-
 osu.Game/Overlays/Notifications/Notification.cs     | 13 ++++++-------
 .../Overlays/Notifications/NotificationSection.cs   |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs  |  6 +++---
 osu.Game/Updater/UpdateManager.cs                   |  6 +++---
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs b/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
index e7a6e9a543..641c1ad523 100644
--- a/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
+++ b/osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Online
         {
             AddStep("download beatmap", () => beatmaps.Download(test_db_model));
 
-            AddStep("cancel download from notification", () => recentNotification.Close());
+            AddStep("cancel download from notification", () => recentNotification.Close(true));
 
             AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_db_model) == null);
             AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);
diff --git a/osu.Game/Database/ModelDownloader.cs b/osu.Game/Database/ModelDownloader.cs
index a3678602d1..877c90a534 100644
--- a/osu.Game/Database/ModelDownloader.cs
+++ b/osu.Game/Database/ModelDownloader.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Database
                 {
                     if (error is WebException webException && webException.Message == @"TooManyRequests")
                     {
-                        notification.Close();
+                        notification.Close(false);
                         PostNotification?.Invoke(new TooManyDownloadsNotification());
                     }
                     else
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index fe2f67973a..acb277d4b4 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Notifications
                                     },
                                     new CloseButton(CloseButtonIcon)
                                     {
-                                        Action = Close,
+                                        Action = () => Close(true),
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
                                     }
@@ -214,7 +214,7 @@ namespace osu.Game.Overlays.Notifications
             // right click doesn't trigger OnClick so we need to handle here until that changes.
             if (e.Button != MouseButton.Left)
             {
-                Close();
+                Close(true);
                 return true;
             }
 
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
             if (e.Button == MouseButton.Left)
                 Activated?.Invoke();
 
-            Close();
+            Close(true);
             return true;
         }
 
@@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close()
+        public virtual void Close(bool userTriggered)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
-            if (dragContainer.FlingLeft())
+            if (userTriggered && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
             {
@@ -272,7 +272,6 @@ namespace osu.Game.Overlays.Notifications
             public DragContainer(Notification notification)
             {
                 this.notification = notification;
-                notification.Closed += () => FlingLeft();
             }
 
             public override RectangleF BoundingBox
@@ -363,7 +362,7 @@ namespace osu.Game.Overlays.Notifications
 
                 flinging = true;
                 ClearTransforms();
-                notification.Close();
+                notification.Close(true);
                 return true;
             }
 
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 14bacca534..16105f913f 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            notifications.Children.ForEach(c => c.Close());
+            notifications.Children.ForEach(c => c.Close(true));
         }
 
         protected override void Update()
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index bdf6f704e5..55d6d5057a 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Notifications
                 case ProgressNotificationState.Completed:
                     loadingSpinner.Hide();
                     attemptPostCompletion();
-                    base.Close();
+                    base.Close(false);
                     break;
             }
         }
@@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        public override void Close()
+        public override void Close(bool userTriggered)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close();
+                    base.Close(userTriggered);
                     break;
 
                 case ProgressNotificationState.Active:
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 49009e9124..2ef6741ffd 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Updater
                 StartDownload();
             }
 
-            public override void Close()
+            public override void Close(bool userTriggered)
             {
                 // cancelling updates is not currently supported by the underlying updater.
                 // only allow dismissing for now.
@@ -156,7 +156,7 @@ namespace osu.Game.Updater
                 switch (State)
                 {
                     case ProgressNotificationState.Cancelled:
-                        base.Close();
+                        base.Close(userTriggered);
                         break;
                 }
             }
@@ -177,7 +177,7 @@ namespace osu.Game.Updater
             public void FailDownload()
             {
                 State = ProgressNotificationState.Cancelled;
-                Close();
+                Close(false);
             }
         }
     }

From 91c415f29b693460123762b6e7023c15d32b856c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 16:58:20 +0900
Subject: [PATCH 266/709] Fix nullability oversight in
 `ManiaRulesetConfigManager`

---
 .../Configuration/ManiaRulesetConfigManager.cs                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index b30d72f2e2..d367c82ed8 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Configuration.Tracking;
 using osu.Game.Configuration;
@@ -13,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 {
     public class ManiaRulesetConfigManager : RulesetConfigManager<ManiaRulesetSetting>
     {
-        public ManiaRulesetConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
+        public ManiaRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
         {
         }

From 89e128c0f3469e31d80ef2e165b324d4cbe80385 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 17:35:56 +0900
Subject: [PATCH 267/709] Fix bindable event binds to `HitObject` directly

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 92d83d900e..ab4b492767 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -53,6 +54,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
 
+        [UsedImplicitly]
+        private readonly IBindable<int> sliderVersion;
+
         public PathControlPointPiece(Slider slider, PathControlPoint controlPoint)
         {
             this.slider = slider;
@@ -61,7 +65,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             // we don't want to run the path type update on construction as it may inadvertently change the slider.
             cachePoints(slider);
 
-            slider.Path.Version.BindValueChanged(_ =>
+            sliderVersion = slider.Path.Version.GetBoundCopy();
+            sliderVersion.BindValueChanged(_ =>
             {
                 cachePoints(slider);
                 updatePathType();

From 58c1ea03215bc894bb770e2864d3b33c869d19db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 17:51:15 +0900
Subject: [PATCH 268/709] Fix potential crash when opening changelog overlay if
 entry has no URL

---
 osu.Game/Overlays/Changelog/ChangelogEntry.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
index fdeba3f304..4d034007b1 100644
--- a/osu.Game/Overlays/Changelog/ChangelogEntry.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Diagnostics;
 using System.Net;
 using System.Text.RegularExpressions;
 using osu.Framework.Allocation;
@@ -93,7 +94,7 @@ namespace osu.Game.Overlays.Changelog
                 t.Colour = entryColour;
             });
 
-            if (!string.IsNullOrEmpty(entry.Repository))
+            if (!string.IsNullOrEmpty(entry.Repository) && !string.IsNullOrEmpty(entry.GithubUrl))
                 addRepositoryReference(title, entryColour);
 
             if (entry.GithubUser != null)
@@ -104,17 +105,22 @@ namespace osu.Game.Overlays.Changelog
 
         private void addRepositoryReference(LinkFlowContainer title, Color4 entryColour)
         {
+            Debug.Assert(!string.IsNullOrEmpty(entry.Repository));
+            Debug.Assert(!string.IsNullOrEmpty(entry.GithubUrl));
+
             title.AddText(" (", t =>
             {
                 t.Font = fontLarge;
                 t.Colour = entryColour;
             });
+
             title.AddLink($"{entry.Repository.Replace("ppy/", "")}#{entry.GithubPullRequestId}", entry.GithubUrl,
                 t =>
                 {
                     t.Font = fontLarge;
                     t.Colour = entryColour;
                 });
+
             title.AddText(")", t =>
             {
                 t.Font = fontLarge;

From 27d4016ccb360991c37750bf5fe67e193b8fa038 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 12 Sep 2022 18:32:14 +0900
Subject: [PATCH 269/709] Add `ScoreProcessor.ComputeAccuracy()`

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 64d5639133..7456ce06bd 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -272,7 +272,24 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Computes the total score of a given finalised <see cref="ScoreInfo"/>. This should be used when a score is known to be complete.
+        /// Computes the accuracy of a given <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="scoreInfo">The <see cref="ScoreInfo"/> to compute the total score of.</param>
+        /// <returns>The score's accuracy.</returns>
+        [Pure]
+        public double ComputeAccuracy(ScoreInfo scoreInfo)
+        {
+            if (!ruleset.RulesetInfo.Equals(scoreInfo.Ruleset))
+                throw new ArgumentException($"Unexpected score ruleset. Expected \"{ruleset.RulesetInfo.ShortName}\" but was \"{scoreInfo.Ruleset.ShortName}\".");
+
+            // We only extract scoring values from the score's statistics. This is because accuracy is always relative to the point of pass or fail rather than relative to the whole beatmap.
+            extractScoringValues(scoreInfo.Statistics, out var current, out var maximum);
+
+            return maximum.BaseScore > 0 ? current.BaseScore / maximum.BaseScore : 1;
+        }
+
+        /// <summary>
+        /// Computes the total score of a given <see cref="ScoreInfo"/>.
         /// </summary>
         /// <remarks>
         /// Does not require <see cref="JudgementProcessor.ApplyBeatmap"/> to have been called before use.

From e29f5cb4568019d031c85394aaca8b648e471a78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 18:53:37 +0900
Subject: [PATCH 270/709] Fix new-style legacy skins with animated judgements
 not adding correct transforms

Closes #16173.
---
 osu.Game/Skinning/LegacyJudgementPieceNew.cs | 2 +-
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceNew.cs b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
index b87fc9acb5..2cb055d8ba 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceNew.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceNew.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning
             if (result != HitResult.Miss)
             {
                 //new judgement shows old as a temporary effect
-                AddInternal(temporaryOldStyle = new LegacyJudgementPieceOld(result, createMainDrawable, 1.05f)
+                AddInternal(temporaryOldStyle = new LegacyJudgementPieceOld(result, createMainDrawable, 1.05f, true)
                 {
                     Blending = BlendingParameters.Additive,
                     Anchor = Anchor.Centre,
diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index c47f46ed2b..7e7f0f027d 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -19,10 +19,13 @@ namespace osu.Game.Skinning
 
         private readonly float finalScale;
 
-        public LegacyJudgementPieceOld(HitResult result, Func<Drawable> createMainDrawable, float finalScale = 1f)
+        private readonly bool allowTransforms;
+
+        public LegacyJudgementPieceOld(HitResult result, Func<Drawable> createMainDrawable, float finalScale = 1f, bool allowTransforms = false)
         {
             this.result = result;
             this.finalScale = finalScale;
+            this.allowTransforms = allowTransforms;
 
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
@@ -43,8 +46,8 @@ namespace osu.Game.Skinning
             this.FadeInFromZero(fade_in_length);
             this.Delay(fade_out_delay).FadeOut(fade_out_length);
 
-            // legacy judgements don't play any transforms if they are an animation.
-            if (animation?.FrameCount > 1)
+            // legacy judgements don't play any transforms if they are an animation.... UNLESS they are the temporary displayed judgement from new piece.
+            if (!allowTransforms && animation?.FrameCount > 1)
                 return;
 
             switch (result)

From 4ee3e8f087e14631622ffca7f446485f50d4982c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 18:57:18 +0900
Subject: [PATCH 271/709] Don't play fling animation when activating a
 notification

---
 osu.Game/Overlays/Notifications/Notification.cs         | 6 +++---
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 4 ++--
 osu.Game/Updater/UpdateManager.cs                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index acb277d4b4..887d729de7 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
             if (e.Button == MouseButton.Left)
                 Activated?.Invoke();
 
-            Close(true);
+            Close(false);
             return true;
         }
 
@@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close(bool userTriggered)
+        public virtual void Close(bool runFlingAnimation)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
-            if (userTriggered && dragContainer.FlingLeft())
+            if (runFlingAnimation && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
             {
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 55d6d5057a..c4d402e5b9 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
-        public override void Close(bool userTriggered)
+        public override void Close(bool runFlingAnimation)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close(userTriggered);
+                    base.Close(runFlingAnimation);
                     break;
 
                 case ProgressNotificationState.Active:
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 2ef6741ffd..100464029b 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Updater
                 StartDownload();
             }
 
-            public override void Close(bool userTriggered)
+            public override void Close(bool runFlingAnimation)
             {
                 // cancelling updates is not currently supported by the underlying updater.
                 // only allow dismissing for now.
@@ -156,7 +156,7 @@ namespace osu.Game.Updater
                 switch (State)
                 {
                     case ProgressNotificationState.Cancelled:
-                        base.Close(userTriggered);
+                        base.Close(runFlingAnimation);
                         break;
                 }
             }

From d92e000fe6db82e258ec9a68e6d0fe9885c99d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:00:03 +0900
Subject: [PATCH 272/709] Fix flinging a notification not correctly running
 `Close`

---
 osu.Game/Overlays/Notifications/Notification.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 887d729de7..6c1b43c3b5 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -254,11 +254,9 @@ namespace osu.Game.Overlays.Notifications
             if (runFlingAnimation && dragContainer.FlingLeft())
                 this.FadeOut(600, Easing.In);
             else
-            {
-                Closed?.Invoke();
                 this.FadeOut(100);
-            }
 
+            Closed?.Invoke();
             Expire();
         }
 
@@ -311,7 +309,7 @@ namespace osu.Game.Overlays.Notifications
             protected override void OnDragEnd(DragEndEvent e)
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
-                    FlingLeft();
+                    notification.Close(true);
                 else
                     ResetPosition();
 
@@ -362,7 +360,6 @@ namespace osu.Game.Overlays.Notifications
 
                 flinging = true;
                 ClearTransforms();
-                notification.Close(true);
                 return true;
             }
 

From f56f6545c04cd3f4f56a7398a49998ab8fe13da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:06:09 +0900
Subject: [PATCH 273/709] Add test coverage of flinging

---
 .../TestSceneNotificationOverlay.cs           | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 8504da69a7..3d13e98865 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -48,6 +48,40 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestDismissWithoutActivationFling()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("start drag", () =>
+            {
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
+            });
+
+            AddStep("fling away", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for closed", () => notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
+        }
+
         [Test]
         public void TestDismissWithoutActivationCloseButton()
         {
@@ -75,6 +109,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for closed", () => notification.WasClosed);
             AddAssert("was not activated", () => !activated);
             AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
         }
 
         [Test]

From 431e84f99207fb0a429b85ad0a61ab7f7f55a206 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:09:24 +0900
Subject: [PATCH 274/709] Cancel in progress CI runs when new commits are
 pushed

Same as https://github.com/ppy/osu-web/pull/9268.

Should hopefully help with organisation concurrent limits.
---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef729a779f..082e0d247c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,8 @@
 on: [push, pull_request]
 name: Continuous Integration
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   inspect-code:

From 837cc760195cd5c0c4aa5c445657a42151b8b7ca Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 12 Sep 2022 12:50:16 +0200
Subject: [PATCH 275/709] Create TestSceneSelectionBlueprintDeselection.cs

---
 .../TestSceneSelectionBlueprintDeselection.cs | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
new file mode 100644
index 0000000000..fdc05e9456
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.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 NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public class TestSceneSelectionBlueprintDeselection : TestSceneOsuEditor
+    {
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        [Test]
+        public void TestSingleDeleteAtSameTime()
+        {
+            HitCircle? circle1 = null;
+            HitCircle? circle2 = null;
+
+            AddStep("add two circles at the same time", () =>
+            {
+                circle1 = new HitCircle();
+                circle2 = new HitCircle();
+                EditorClock.Seek(0);
+                EditorBeatmap.Add(circle1);
+                EditorBeatmap.Add(circle2);
+                EditorBeatmap.SelectedHitObjects.Add(circle1);
+                EditorBeatmap.SelectedHitObjects.Add(circle2);
+            });
+
+            AddStep("delete the first circle", () => EditorBeatmap.Remove(circle1));
+        }
+    }
+}

From f31deaef7ca8dd0f7defd794c77f8a8b6f0f718c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 19:51:49 +0900
Subject: [PATCH 276/709] Simplify skin bindable flow

Now, nothing touches the configuration apart from `OsuGame`, making
everything else flow better and avoid weird cyclic set bugs.

Closes https://github.com/ppy/osu/issues/20234.
---
 osu.Game/OsuGame.cs                           | 24 ++-----
 .../Overlays/Settings/Sections/SkinSection.cs | 62 ++++---------------
 osu.Game/Skinning/SkinManager.cs              | 20 +++++-
 3 files changed, 36 insertions(+), 70 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9e2384322a..0d115f62fe 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -56,14 +56,12 @@ using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
-using osu.Game.Skinning;
 using osu.Game.Skinning.Editor;
 using osu.Game.Updater;
 using osu.Game.Users;
 using osu.Game.Utils;
 using osuTK.Graphics;
 using Sentry;
-using Logger = osu.Framework.Logging.Logger;
 
 namespace osu.Game
 {
@@ -294,25 +292,13 @@ namespace osu.Game
 
             Ruleset.ValueChanged += r => configRuleset.Value = r.NewValue.ShortName;
 
-            // bind config int to database SkinInfo
             configSkin = LocalConfig.GetBindable<string>(OsuSetting.Skin);
+
+            // Transfer skin from config to realm instance once on startup.
+            SkinManager.SetSkinFromConfiguration(configSkin.Value);
+
+            // Transfer any runtime changes back to configuration file.
             SkinManager.CurrentSkinInfo.ValueChanged += skin => configSkin.Value = skin.NewValue.ID.ToString();
-            configSkin.ValueChanged += skinId =>
-            {
-                Live<SkinInfo> skinInfo = null;
-
-                if (Guid.TryParse(skinId.NewValue, out var guid))
-                    skinInfo = SkinManager.Query(s => s.ID == guid);
-
-                if (skinInfo == null)
-                {
-                    if (guid == SkinInfo.CLASSIC_SKIN)
-                        skinInfo = DefaultLegacySkin.CreateInfo().ToLiveUnmanaged();
-                }
-
-                SkinManager.CurrentSkinInfo.Value = skinInfo ?? DefaultSkin.CreateInfo().ToLiveUnmanaged();
-            };
-            configSkin.TriggerChange();
 
             IsActive.BindValueChanged(active => updateActiveState(active.NewValue), true);
 
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index d23ef7e3e7..13249e37ca 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
-using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Localisation;
@@ -36,9 +35,6 @@ namespace osu.Game.Overlays.Settings.Sections
             Icon = FontAwesome.Solid.PaintBrush
         };
 
-        private readonly Bindable<Live<SkinInfo>> dropdownBindable = new Bindable<Live<SkinInfo>> { Default = DefaultSkin.CreateInfo().ToLiveUnmanaged() };
-        private readonly Bindable<string> configBindable = new Bindable<string>();
-
         private static readonly Live<SkinInfo> random_skin_info = new SkinInfo
         {
             ID = SkinInfo.RANDOM_SKIN,
@@ -56,13 +52,14 @@ namespace osu.Game.Overlays.Settings.Sections
         private IDisposable realmSubscription;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuConfigManager config, [CanBeNull] SkinEditorOverlay skinEditor)
+        private void load([CanBeNull] SkinEditorOverlay skinEditor)
         {
             Children = new Drawable[]
             {
                 skinDropdown = new SkinSettingsDropdown
                 {
                     LabelText = SkinSettingsStrings.CurrentSkin,
+                    Current = skins.CurrentSkinInfo,
                     Keywords = new[] { @"skins" }
                 },
                 new SettingsButton
@@ -73,47 +70,30 @@ namespace osu.Game.Overlays.Settings.Sections
                 new ExportSkinButton(),
                 new DeleteSkinButton(),
             };
-
-            config.BindWith(OsuSetting.Skin, configBindable);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            skinDropdown.Current = dropdownBindable;
+            skinDropdown.Current = skins.CurrentSkinInfo;
 
             realmSubscription = realm.RegisterForNotifications(_ => realm.Realm.All<SkinInfo>()
                                                                          .Where(s => !s.DeletePending)
                                                                          .OrderByDescending(s => s.Protected) // protected skins should be at the top.
                                                                          .ThenBy(s => s.Name, StringComparer.OrdinalIgnoreCase), skinsChanged);
 
-            configBindable.BindValueChanged(_ => Scheduler.AddOnce(updateSelectedSkinFromConfig));
-
-            dropdownBindable.BindValueChanged(dropdownSelectionChanged);
-        }
-
-        private void dropdownSelectionChanged(ValueChangedEvent<Live<SkinInfo>> skin)
-        {
-            // Only handle cases where it's clear the user has intent to change skins.
-            if (skin.OldValue == null) return;
-
-            if (skin.NewValue.Equals(random_skin_info))
+            skinDropdown.Current.BindValueChanged(skin =>
             {
-                var skinBefore = skins.CurrentSkinInfo.Value;
-
-                skins.SelectRandomSkin();
-
-                if (skinBefore == skins.CurrentSkinInfo.Value)
+                if (skin.NewValue == random_skin_info)
                 {
-                    // the random selection didn't change the skin, so we should manually update the dropdown to match.
-                    dropdownBindable.Value = skins.CurrentSkinInfo.Value;
+                    // before selecting random, set the skin back to the previous selection.
+                    // this is done because at this point it will be random_skin_info, and would
+                    // cause SelectRandomSkin to be unable to skip the previous selection.
+                    skins.CurrentSkinInfo.Value = skin.OldValue;
+                    skins.SelectRandomSkin();
                 }
-
-                return;
-            }
-
-            configBindable.Value = skin.NewValue.ID.ToString();
+            });
         }
 
         private void skinsChanged(IRealmCollection<SkinInfo> sender, ChangeSet changes, Exception error)
@@ -132,25 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections
                 dropdownItems.Add(skin.ToLive(realm));
             dropdownItems.Insert(protectedCount, random_skin_info);
 
-            Schedule(() =>
-            {
-                skinDropdown.Items = dropdownItems;
-
-                updateSelectedSkinFromConfig();
-            });
-        }
-
-        private void updateSelectedSkinFromConfig()
-        {
-            if (!skinDropdown.Items.Any())
-                return;
-
-            Live<SkinInfo> skin = null;
-
-            if (Guid.TryParse(configBindable.Value, out var configId))
-                skin = skinDropdown.Items.FirstOrDefault(s => s.ID == configId);
-
-            dropdownBindable.Value = skin ?? skinDropdown.Items.First();
+            Schedule(() => skinDropdown.Items = dropdownItems);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index f677cebe51..7ffea3b54f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -119,7 +119,9 @@ namespace osu.Game.Skinning
             Realm.Run(r =>
             {
                 // choose from only user skins, removing the current selection to ensure a new one is chosen.
-                var randomChoices = r.All<SkinInfo>().Where(s => !s.DeletePending && s.ID != CurrentSkinInfo.Value.ID).ToArray();
+                var randomChoices = r.All<SkinInfo>()
+                                     .Where(s => !s.DeletePending && s.ID != CurrentSkinInfo.Value.ID)
+                                     .ToArray();
 
                 if (randomChoices.Length == 0)
                 {
@@ -297,5 +299,21 @@ namespace osu.Game.Skinning
                 Delete(items.ToList(), silent);
             });
         }
+
+        public void SetSkinFromConfiguration(string guidString)
+        {
+            Live<SkinInfo> skinInfo = null;
+
+            if (Guid.TryParse(guidString, out var guid))
+                skinInfo = Query(s => s.ID == guid);
+
+            if (skinInfo == null)
+            {
+                if (guid == SkinInfo.CLASSIC_SKIN)
+                    skinInfo = DefaultLegacySkin.SkinInfo;
+            }
+
+            CurrentSkinInfo.Value = skinInfo ?? DefaultSkin.SkinInfo;
+        }
     }
 }

From 2b4b14ca9990a4626fefcbecf624ca2d97bf4244 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 20:06:52 +0900
Subject: [PATCH 277/709] Fix `SongProgress` invalidating too often

This regressed with https://github.com/ppy/osu/pull/19556. Rather than
try and figure whether that new container needs to handle size
differently, this is a simple solution.

Height was taken from a runtime check (maxes out at about 14.5).

Closes #20235.
---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index d0eb8f8ca1..b3d5066a9e 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -47,7 +47,10 @@ namespace osu.Game.Screens.Play.HUD
             if (clock != null)
                 gameplayClock = clock;
 
-            AutoSizeAxes = Axes.Y;
+            // Lock height so changes in text autosize (if character height changes)
+            // don't cause parent invalidation.
+            Height = 14;
+
             Children = new Drawable[]
             {
                 new Container

From 88107108eea0c440babac6e69c1367274c509e18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Sep 2022 20:18:40 +0900
Subject: [PATCH 278/709] Add ability to flick notifications to the right to
 store for later

---
 .../TestSceneNotificationOverlay.cs           | 37 +++++++++++++++++++
 .../Overlays/NotificationOverlayToastTray.cs  |  5 +++
 .../Overlays/Notifications/Notification.cs    |  4 ++
 3 files changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 3d13e98865..e978b57ba4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -48,6 +48,43 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
         });
 
+        [Test]
+        public void TestForwardWithFlingRight()
+        {
+            bool activated = false;
+            SimpleNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new SimpleNotification
+                {
+                    Text = @"Welcome to osu!. Enjoy your stay!",
+                    Activated = () => activated = true,
+                });
+            });
+
+            AddStep("start drag", () =>
+            {
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(500, 0));
+            });
+
+            AddStep("fling away", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddAssert("was not closed", () => !notification.WasClosed);
+            AddAssert("was not activated", () => !activated);
+            AddAssert("is not read", () => !notification.Read);
+            AddAssert("is not toast", () => !notification.IsInToastTray);
+
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddAssert("unread count one", () => notificationOverlay.UnreadCount.Value == 1);
+        }
+
         [Test]
         public void TestDismissWithoutActivationFling()
         {
diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index 1da05dab75..e3f8734581 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -100,6 +100,8 @@ namespace osu.Game.Overlays
         {
             ++runningDepth;
 
+            notification.ForwardToOverlay = () => forwardNotification(notification);
+
             int depth = notification.DisplayOnTop ? -runningDepth : runningDepth;
 
             toastFlow.Insert(depth, notification);
@@ -130,6 +132,9 @@ namespace osu.Game.Overlays
 
         private void forwardNotification(Notification notification)
         {
+            if (!notification.IsInToastTray)
+                return;
+
             Debug.Assert(notification.Parent == toastFlow);
 
             // Temporarily remove from flow so we can animate the position off to the right.
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 6c1b43c3b5..885bb2fc6c 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public Func<bool>? Activated;
 
+        public Action? ForwardToOverlay { get; set; }
+
         /// <summary>
         /// Should we show at the top of our section on display?
         /// </summary>
@@ -310,6 +312,8 @@ namespace osu.Game.Overlays.Notifications
             {
                 if (Rotation < -10 || velocity.X < -0.3f)
                     notification.Close(true);
+                else if (X > 30 || velocity.X > 0.3f)
+                    notification.ForwardToOverlay?.Invoke();
                 else
                     ResetPosition();
 

From 8cbc0502aea885ce2468ccfda0b457297382ead9 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 12 Sep 2022 15:51:18 +0300
Subject: [PATCH 279/709] Inline `CalculateEffect`

---
 osu.Game/Overlays/Mods/ModsEffectDisplay.cs | 27 ++++-----------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
index 3b112fdbd3..eed3181e49 100644
--- a/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
+++ b/osu.Game/Overlays/Mods/ModsEffectDisplay.cs
@@ -49,22 +49,9 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected abstract LocalisableString Label { get; }
 
-        /// <summary>
-        /// Calculates, does current value increase difficulty or decrease it.
-        /// </summary>
-        /// <param name="value">Value to calculate for. Will arrive from <see cref="Current"/> bindable once it changes.</param>
-        /// <returns>Effect of the value.</returns>
-        /// <remarks>
-        /// Default implementation compares the value with <see cref="Current"/>.<see cref="Bindable{T}.Default"/>, bigger value counts as difficulty increase.
-        /// </remarks>
-        protected virtual ModEffect CalculateEffect(double value)
-        {
-            return CalculateForSign(value.CompareTo(Current.Default));
-        }
-
         protected virtual float ValueAreaWidth => 56;
 
-        protected virtual string CounterFormat => "N0";
+        protected virtual string CounterFormat => @"N0";
 
         protected override Container<Drawable> Content => content;
 
@@ -159,7 +146,7 @@ namespace osu.Game.Overlays.Mods
         {
             Current.BindValueChanged(e =>
             {
-                var effect = CalculateEffect(e.NewValue);
+                var effect = CalculateEffectForComparison(e.NewValue.CompareTo(Current.Default));
                 setColours(effect);
             }, true);
         }
@@ -192,14 +179,12 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        #region Quick implementations for CalculateEffect
-
         /// <summary>
         /// Converts signed integer into <see cref="ModEffect"/>. Negative values are counted as difficulty reduction, positive as increase.
         /// </summary>
-        /// <param name="comparison">Value to convert. Can be obtained from CompareTo.</param>
-        /// <returns>Effect.</returns>
-        protected ModEffect CalculateForSign(int comparison)
+        /// <param name="comparison">Value to convert. Will arrive from comparison between <see cref="Current"/> bindable once it changes and it's <see cref="Bindable{T}.Default"/>.</param>
+        /// <returns>Effect of the value.</returns>
+        protected virtual ModEffect CalculateEffectForComparison(int comparison)
         {
             if (comparison == 0)
                 return ModEffect.NotChanged;
@@ -209,8 +194,6 @@ namespace osu.Game.Overlays.Mods
             return ModEffect.DifficultyIncrease;
         }
 
-        #endregion
-
         protected enum ModEffect
         {
             NotChanged,

From 8400de4b2ea1922138fc0d581f0ac8c3a531bd12 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 12 Sep 2022 17:50:11 +0200
Subject: [PATCH 280/709] invoking hitobject updated before invoking removed

---
 .../TestSceneSelectionBlueprintDeselection.cs | 35 +++++++++++++--
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 45 +++++++++++++------
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
index fdc05e9456..b00582d6f3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
@@ -1,10 +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 System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
@@ -16,13 +18,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         public void TestSingleDeleteAtSameTime()
         {
             HitCircle? circle1 = null;
-            HitCircle? circle2 = null;
 
             AddStep("add two circles at the same time", () =>
             {
-                circle1 = new HitCircle();
-                circle2 = new HitCircle();
                 EditorClock.Seek(0);
+                circle1 = new HitCircle();
+                var circle2 = new HitCircle();
                 EditorBeatmap.Add(circle1);
                 EditorBeatmap.Add(circle2);
                 EditorBeatmap.SelectedHitObjects.Add(circle1);
@@ -31,5 +32,33 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("delete the first circle", () => EditorBeatmap.Remove(circle1));
         }
+
+        [Test]
+        public void TestBigStackDeleteAtSameTime()
+        {
+            AddStep("add 20 circles at the same time", () =>
+            {
+                EditorClock.Seek(0);
+
+                for (int i = 0; i < 20; i++)
+                {
+                    EditorBeatmap.Add(new HitCircle());
+                }
+            });
+
+            AddStep("select half of the circles", () =>
+            {
+                foreach (var hitObject in EditorBeatmap.HitObjects.SkipLast(10).Reverse())
+                {
+                    EditorBeatmap.SelectedHitObjects.Add(hitObject);
+                }
+            });
+
+            AddStep("delete all selected circles", () =>
+            {
+                InputManager.PressKey(Key.Delete);
+                InputManager.ReleaseKey(Key.Delete);
+            });
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 8aa754b305..95b848fec0 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -16,6 +16,7 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
@@ -79,7 +80,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly IBeatmapProcessor beatmapProcessor;
 
-        private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
+        private readonly Dictionary<HitObject, List<IUnbindable>> hitObjectBindables = new Dictionary<HitObject, List<IUnbindable>>();
 
         public EditorBeatmap(IBeatmap playableBeatmap, ISkin beatmapSkin = null, BeatmapInfo beatmapInfo = null)
         {
@@ -97,7 +98,7 @@ namespace osu.Game.Screens.Edit
             beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
 
             foreach (var obj in HitObjects)
-                trackStartTime(obj);
+                trackBindables(obj);
         }
 
         /// <summary>
@@ -222,7 +223,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to insert.</param>
         public void Insert(int index, HitObject hitObject)
         {
-            trackStartTime(hitObject);
+            trackBindables(hitObject);
 
             mutableHitObjects.Insert(index, hitObject);
 
@@ -299,9 +300,9 @@ namespace osu.Game.Screens.Edit
 
             mutableHitObjects.RemoveAt(index);
 
-            var bindable = startTimeBindables[hitObject];
-            bindable.UnbindAll();
-            startTimeBindables.Remove(hitObject);
+            var bindables = hitObjectBindables[hitObject];
+            bindables.ForEach(b => b.UnbindAll());
+            hitObjectBindables.Remove(hitObject);
 
             BeginChange();
             batchPendingDeletes.Add(hitObject);
@@ -325,25 +326,25 @@ namespace osu.Game.Screens.Edit
 
             beatmapProcessor?.PreProcess();
 
+            foreach (var h in batchPendingUpdates) processHitObject(h);
             foreach (var h in batchPendingDeletes) processHitObject(h);
             foreach (var h in batchPendingInserts) processHitObject(h);
-            foreach (var h in batchPendingUpdates) processHitObject(h);
 
             beatmapProcessor?.PostProcess();
 
             // callbacks may modify the lists so let's be safe about it
+            var updates = batchPendingUpdates.ToArray();
+            batchPendingUpdates.Clear();
+
             var deletes = batchPendingDeletes.ToArray();
             batchPendingDeletes.Clear();
 
             var inserts = batchPendingInserts.ToArray();
             batchPendingInserts.Clear();
 
-            var updates = batchPendingUpdates.ToArray();
-            batchPendingUpdates.Clear();
-
+            foreach (var h in updates) HitObjectUpdated?.Invoke(h);
             foreach (var h in deletes) HitObjectRemoved?.Invoke(h);
             foreach (var h in inserts) HitObjectAdded?.Invoke(h);
-            foreach (var h in updates) HitObjectUpdated?.Invoke(h);
 
             updateInProgress.Value = false;
         }
@@ -355,10 +356,12 @@ namespace osu.Game.Screens.Edit
 
         private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, PlayableBeatmap.Difficulty);
 
-        private void trackStartTime(HitObject hitObject)
+        private void trackBindables(HitObject hitObject)
         {
-            startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();
-            startTimeBindables[hitObject].ValueChanged += _ =>
+            var bindables = new List<IUnbindable>(3);
+
+            var startTimeBindable = hitObject.StartTimeBindable.GetBoundCopy();
+            startTimeBindable.ValueChanged += _ =>
             {
                 // For now we'll remove and re-add the hitobject. This is not optimal and can be improved if required.
                 mutableHitObjects.Remove(hitObject);
@@ -368,6 +371,20 @@ namespace osu.Game.Screens.Edit
 
                 Update(hitObject);
             };
+            bindables.Add(startTimeBindable);
+
+            if (hitObject is IHasComboInformation hasCombo)
+            {
+                var comboIndexBindable = hasCombo.ComboIndexBindable.GetBoundCopy();
+                comboIndexBindable.ValueChanged += _ => Update(hitObject);
+                bindables.Add(comboIndexBindable);
+
+                var indexInCurrentComboBindable = hasCombo.IndexInCurrentComboBindable.GetBoundCopy();
+                indexInCurrentComboBindable.ValueChanged += _ => Update(hitObject);
+                bindables.Add(indexInCurrentComboBindable);
+            }
+
+            hitObjectBindables[hitObject] = bindables;
         }
 
         private int findInsertionIndex(IReadOnlyList<HitObject> list, double startTime)

From a5b962d9a3bc55beac3b4f89aa1544879adf6c20 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 01:37:23 +0300
Subject: [PATCH 281/709] Add failing test case

---
 .../Online/TestSceneBeatmapListingOverlay.cs  | 55 ++++++++++++++++---
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 8ef120d252..2c9b34e4a7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Tests.Visual.Online
 
         private OsuConfigManager localConfig;
 
+        private bool returnCursorOnResponse;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -61,6 +63,7 @@ namespace osu.Game.Tests.Visual.Online
                     searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                     {
                         BeatmapSets = setsForResponse,
+                        Cursor = returnCursorOnResponse ? new Cursor() : null,
                     });
 
                     return true;
@@ -106,7 +109,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
 
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -127,10 +130,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
-            AddStep("show more results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 30).ToArray()));
+            AddStep("show more results", () => fetchFor(getManyBeatmaps(30).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(30);
         }
 
@@ -139,7 +142,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddAssert("is visible", () => overlay.State.Value == Visibility.Visible);
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             assertAllCardsOfType<BeatmapCardNormal>(100);
 
             setCardSize(BeatmapCardSize.Extra, viaConfig);
@@ -161,7 +164,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("fetch for 0 beatmaps", () => fetchFor());
             placeholderShown();
 
-            AddStep("show many results", () => fetchFor(Enumerable.Repeat(CreateAPIBeatmapSet(Ruleset.Value), 100).ToArray()));
+            AddStep("show many results", () => fetchFor(getManyBeatmaps(100).ToArray()));
             AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 100);
             AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any(d => d.IsPresent));
 
@@ -180,6 +183,32 @@ namespace osu.Game.Tests.Visual.Online
                 });
         }
 
+        /// <summary>
+        /// During pagination, the first beatmap of the second page may be a duplicate of the last beatmap from the previous page.
+        /// This is currently the case with osu!web API due to ES relevance score's presence in the response cursor.
+        /// See: https://github.com/ppy/osu-web/issues/9270
+        /// </summary>
+        [Test]
+        public void TestDuplicatedBeatmapOnlyShowsOnce()
+        {
+            APIBeatmapSet beatmapSet = null;
+
+            AddStep("show many results", () =>
+            {
+                beatmapSet = CreateAPIBeatmapSet(Ruleset.Value);
+                beatmapSet.Title = "last beatmap of first page";
+
+                fetchFor(getManyBeatmaps(49).Append(beatmapSet).ToArray(), true);
+            });
+            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 50);
+
+            AddStep("set next page", () => setSearchResponse(getManyBeatmaps(49).Prepend(beatmapSet).ToArray(), false));
+            AddStep("scroll to end", () => overlay.ChildrenOfType<OverlayScrollContainer>().Single().ScrollToEnd());
+            AddUntilStep("wait for loaded", () => this.ChildrenOfType<BeatmapCard>().Count() == 99);
+
+            AddAssert("beatmap not duplicated", () => overlay.ChildrenOfType<BeatmapCard>().Count(c => c.BeatmapSet.Equals(beatmapSet)) == 1);
+        }
+
         [Test]
         public void TestUserWithoutSupporterUsesSupporterOnlyFiltersWithoutResults()
         {
@@ -336,15 +365,25 @@ namespace osu.Game.Tests.Visual.Online
 
         private static int searchCount;
 
-        private void fetchFor(params APIBeatmapSet[] beatmaps)
+        private APIBeatmapSet[] getManyBeatmaps(int count) => Enumerable.Range(0, count).Select(_ => CreateAPIBeatmapSet(Ruleset.Value)).ToArray();
+
+        private void fetchFor(params APIBeatmapSet[] beatmaps) => fetchFor(beatmaps, false);
+
+        private void fetchFor(APIBeatmapSet[] beatmaps, bool hasNextPage)
         {
-            setsForResponse.Clear();
-            setsForResponse.AddRange(beatmaps);
+            setSearchResponse(beatmaps, hasNextPage);
 
             // trigger arbitrary change for fetching.
             searchControl.Query.Value = $"search {searchCount++}";
         }
 
+        private void setSearchResponse(APIBeatmapSet[] beatmaps, bool hasNextPage)
+        {
+            setsForResponse.Clear();
+            setsForResponse.AddRange(beatmaps);
+            returnCursorOnResponse = hasNextPage;
+        }
+
         private void setRankAchievedFilter(ScoreRank[] ranks)
         {
             AddStep($"set Rank Achieved filter to [{string.Join(',', ranks)}]", () =>

From 07f577a0c67314035588ba33856e135643632a02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 01:38:52 +0300
Subject: [PATCH 282/709] Fix beatmap listing potentially showing duplicate
 beatmap cards

---
 osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs | 13 ++++++++++++-
 osu.Game/Overlays/BeatmapListingOverlay.cs       |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
index b9e0a4e6cb..70312a1535 100644
--- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
+++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Beatmaps.Drawables.Cards
 {
-    public abstract class BeatmapCard : OsuClickableContainer
+    public abstract class BeatmapCard : OsuClickableContainer, IEquatable<BeatmapCard>
     {
         public const float TRANSITION_DURATION = 400;
         public const float CORNER_RADIUS = 10;
@@ -96,5 +96,16 @@ namespace osu.Game.Beatmaps.Drawables.Cards
                     throw new ArgumentOutOfRangeException(nameof(size), size, @"Unsupported card size");
             }
         }
+
+        public bool Equals(BeatmapCard? other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return BeatmapSet.Equals(other.BeatmapSet);
+        }
+
+        public override bool Equals(object obj) => obj is BeatmapCard other && Equals(other);
+        public override int GetHashCode() => BeatmapSet.GetHashCode();
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 3136492af0..70c6c60ecd 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,8 @@ namespace osu.Game.Overlays
             }
             else
             {
+                newCards = newCards.Except(foundContent);
+
                 panelLoadTask = LoadComponentsAsync(newCards, loaded =>
                 {
                     lastFetchDisplayedTime = Time.Current;
@@ -185,7 +187,7 @@ namespace osu.Game.Overlays
             }
         }
 
-        private BeatmapCard[] createCardsFor(IEnumerable<APIBeatmapSet> beatmapSets) => beatmapSets.Select(set => BeatmapCard.Create(set, filterControl.CardSize.Value).With(c =>
+        private IEnumerable<BeatmapCard> createCardsFor(IEnumerable<APIBeatmapSet> beatmapSets) => beatmapSets.Select(set => BeatmapCard.Create(set, filterControl.CardSize.Value).With(c =>
         {
             c.Anchor = Anchor.TopCentre;
             c.Origin = Anchor.TopCentre;

From 718f8c4ee206bfeaa52177730fc74cb0c7d404b6 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 13 Sep 2022 01:09:42 +0200
Subject: [PATCH 283/709] revert the fix

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 45 ++++++++------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 95b848fec0..8aa754b305 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -16,7 +16,6 @@ using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit
@@ -80,7 +79,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly IBeatmapProcessor beatmapProcessor;
 
-        private readonly Dictionary<HitObject, List<IUnbindable>> hitObjectBindables = new Dictionary<HitObject, List<IUnbindable>>();
+        private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
         public EditorBeatmap(IBeatmap playableBeatmap, ISkin beatmapSkin = null, BeatmapInfo beatmapInfo = null)
         {
@@ -98,7 +97,7 @@ namespace osu.Game.Screens.Edit
             beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
 
             foreach (var obj in HitObjects)
-                trackBindables(obj);
+                trackStartTime(obj);
         }
 
         /// <summary>
@@ -223,7 +222,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="hitObject">The <see cref="HitObject"/> to insert.</param>
         public void Insert(int index, HitObject hitObject)
         {
-            trackBindables(hitObject);
+            trackStartTime(hitObject);
 
             mutableHitObjects.Insert(index, hitObject);
 
@@ -300,9 +299,9 @@ namespace osu.Game.Screens.Edit
 
             mutableHitObjects.RemoveAt(index);
 
-            var bindables = hitObjectBindables[hitObject];
-            bindables.ForEach(b => b.UnbindAll());
-            hitObjectBindables.Remove(hitObject);
+            var bindable = startTimeBindables[hitObject];
+            bindable.UnbindAll();
+            startTimeBindables.Remove(hitObject);
 
             BeginChange();
             batchPendingDeletes.Add(hitObject);
@@ -326,25 +325,25 @@ namespace osu.Game.Screens.Edit
 
             beatmapProcessor?.PreProcess();
 
-            foreach (var h in batchPendingUpdates) processHitObject(h);
             foreach (var h in batchPendingDeletes) processHitObject(h);
             foreach (var h in batchPendingInserts) processHitObject(h);
+            foreach (var h in batchPendingUpdates) processHitObject(h);
 
             beatmapProcessor?.PostProcess();
 
             // callbacks may modify the lists so let's be safe about it
-            var updates = batchPendingUpdates.ToArray();
-            batchPendingUpdates.Clear();
-
             var deletes = batchPendingDeletes.ToArray();
             batchPendingDeletes.Clear();
 
             var inserts = batchPendingInserts.ToArray();
             batchPendingInserts.Clear();
 
-            foreach (var h in updates) HitObjectUpdated?.Invoke(h);
+            var updates = batchPendingUpdates.ToArray();
+            batchPendingUpdates.Clear();
+
             foreach (var h in deletes) HitObjectRemoved?.Invoke(h);
             foreach (var h in inserts) HitObjectAdded?.Invoke(h);
+            foreach (var h in updates) HitObjectUpdated?.Invoke(h);
 
             updateInProgress.Value = false;
         }
@@ -356,12 +355,10 @@ namespace osu.Game.Screens.Edit
 
         private void processHitObject(HitObject hitObject) => hitObject.ApplyDefaults(ControlPointInfo, PlayableBeatmap.Difficulty);
 
-        private void trackBindables(HitObject hitObject)
+        private void trackStartTime(HitObject hitObject)
         {
-            var bindables = new List<IUnbindable>(3);
-
-            var startTimeBindable = hitObject.StartTimeBindable.GetBoundCopy();
-            startTimeBindable.ValueChanged += _ =>
+            startTimeBindables[hitObject] = hitObject.StartTimeBindable.GetBoundCopy();
+            startTimeBindables[hitObject].ValueChanged += _ =>
             {
                 // For now we'll remove and re-add the hitobject. This is not optimal and can be improved if required.
                 mutableHitObjects.Remove(hitObject);
@@ -371,20 +368,6 @@ namespace osu.Game.Screens.Edit
 
                 Update(hitObject);
             };
-            bindables.Add(startTimeBindable);
-
-            if (hitObject is IHasComboInformation hasCombo)
-            {
-                var comboIndexBindable = hasCombo.ComboIndexBindable.GetBoundCopy();
-                comboIndexBindable.ValueChanged += _ => Update(hitObject);
-                bindables.Add(comboIndexBindable);
-
-                var indexInCurrentComboBindable = hasCombo.IndexInCurrentComboBindable.GetBoundCopy();
-                indexInCurrentComboBindable.ValueChanged += _ => Update(hitObject);
-                bindables.Add(indexInCurrentComboBindable);
-            }
-
-            hitObjectBindables[hitObject] = bindables;
         }
 
         private int findInsertionIndex(IReadOnlyList<HitObject> list, double startTime)

From 5fba21d658335f88010cc1748891a9be65f6ea01 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 02:21:01 +0300
Subject: [PATCH 284/709] Rename parameter to clarify purpose

---
 osu.Game/Skinning/LegacyJudgementPieceOld.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/LegacyJudgementPieceOld.cs b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
index 7e7f0f027d..3f4d13c082 100644
--- a/osu.Game/Skinning/LegacyJudgementPieceOld.cs
+++ b/osu.Game/Skinning/LegacyJudgementPieceOld.cs
@@ -18,14 +18,13 @@ namespace osu.Game.Skinning
         private readonly HitResult result;
 
         private readonly float finalScale;
+        private readonly bool forceTransforms;
 
-        private readonly bool allowTransforms;
-
-        public LegacyJudgementPieceOld(HitResult result, Func<Drawable> createMainDrawable, float finalScale = 1f, bool allowTransforms = false)
+        public LegacyJudgementPieceOld(HitResult result, Func<Drawable> createMainDrawable, float finalScale = 1f, bool forceTransforms = false)
         {
             this.result = result;
             this.finalScale = finalScale;
-            this.allowTransforms = allowTransforms;
+            this.forceTransforms = forceTransforms;
 
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
@@ -47,7 +46,7 @@ namespace osu.Game.Skinning
             this.Delay(fade_out_delay).FadeOut(fade_out_length);
 
             // legacy judgements don't play any transforms if they are an animation.... UNLESS they are the temporary displayed judgement from new piece.
-            if (!allowTransforms && animation?.FrameCount > 1)
+            if (animation?.FrameCount > 1 && !forceTransforms)
                 return;
 
             switch (result)

From a1f4724685c356272ca11342b0eff4eff3470b46 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 13 Sep 2022 01:38:29 +0200
Subject: [PATCH 285/709] moved the location of the tests

---
 .../Editing}/TestSceneSelectionBlueprintDeselection.cs    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
 rename {osu.Game.Rulesets.Osu.Tests/Editor => osu.Game.Tests/Visual/Editing}/TestSceneSelectionBlueprintDeselection.cs (88%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs b/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
similarity index 88%
rename from osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
index b00582d6f3..6141e5f31c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSelectionBlueprintDeselection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
@@ -4,14 +4,18 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Beatmaps;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Osu.Tests.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
-    public class TestSceneSelectionBlueprintDeselection : TestSceneOsuEditor
+    public class TestSceneSelectionBlueprintDeselection : EditorTestScene
     {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
         [Test]

From a6f68e4a908dc8a6593445f6ee639b1912577b66 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 03:08:13 +0300
Subject: [PATCH 286/709] Fix NRT inspections

---
 osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
index 4510fda11d..1042341337 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select unchanged Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
-                var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>();
+                var difficultyAdjustMod = ruleset.CreateMod<ModDifficultyAdjust>().AsNonNull();
                 difficultyAdjustMod.ReadFromDifficulty(advancedStats.BeatmapInfo.Difficulty);
                 SelectedMods.Value = new[] { difficultyAdjustMod };
             });
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select changed Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.BeatmapInfo.Ruleset.CreateInstance().AsNonNull();
-                var difficultyAdjustMod = ruleset.CreateMod<OsuModDifficultyAdjust>();
+                var difficultyAdjustMod = ruleset.CreateMod<OsuModDifficultyAdjust>().AsNonNull();
                 var originalDifficulty = advancedStats.BeatmapInfo.Difficulty;
 
                 difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);

From fd48249eef42c8af74fb50373744d58bc80eb3f7 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 13 Sep 2022 02:20:52 +0200
Subject: [PATCH 287/709] fix with new event

---
 .../Components/HitObjectOrderedSelectionContainer.cs      | 6 ++----
 osu.Game/Screens/Edit/EditorBeatmap.cs                    | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index d6fd07c998..2d8dca9c2d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -24,11 +24,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.LoadComplete();
 
-            editorBeatmap.HitObjectUpdated += hitObjectUpdated;
+            editorBeatmap.SelectionBlueprintsShouldBeSorted += SortInternal;
         }
 
-        private void hitObjectUpdated(HitObject _) => SortInternal();
-
         public override void Add(SelectionBlueprint<HitObject> drawable)
         {
             SortInternal();
@@ -72,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.Dispose(isDisposing);
 
             if (editorBeatmap != null)
-                editorBeatmap.HitObjectUpdated -= hitObjectUpdated;
+                editorBeatmap.SelectionBlueprintsShouldBeSorted -= SortInternal;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 8aa754b305..82f2187901 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -48,6 +48,11 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public event Action<HitObject> HitObjectUpdated;
 
+        /// <summary>
+        /// Invoked after <see cref="HitObjects"/> is updated during <see cref="UpdateState"/> and blueprints need to be sorted immediately to prevent a crash.
+        /// </summary>
+        public event Action SelectionBlueprintsShouldBeSorted;
+
         /// <summary>
         /// All currently selected <see cref="HitObject"/>s.
         /// </summary>
@@ -331,6 +336,9 @@ namespace osu.Game.Screens.Edit
 
             beatmapProcessor?.PostProcess();
 
+            // Signal selection blueprint sorting because it is possible that the beatmap processor changed the order of the selection blueprints
+            SelectionBlueprintsShouldBeSorted?.Invoke();
+
             // callbacks may modify the lists so let's be safe about it
             var deletes = batchPendingDeletes.ToArray();
             batchPendingDeletes.Clear();

From 0ca4be5e5bf43db46950b56c900891e1fd1097d4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Sep 2022 03:45:31 +0300
Subject: [PATCH 288/709] Fix one more inspection

---
 .../UI/DrawableRulesetDependencies.cs         | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index cffbf2c9a1..52387a5740 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -53,20 +53,17 @@ namespace osu.Game.Rulesets.UI
         {
             var resources = ruleset.CreateResourceStore();
 
-            if (resources != null)
-            {
-                var host = parent.Get<GameHost>();
+            var host = parent.Get<GameHost>();
 
-                TextureStore = new TextureStore(host.Renderer, parent.Get<GameHost>().CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
-                CacheAs(TextureStore = new FallbackTextureStore(host.Renderer, TextureStore, parent.Get<TextureStore>()));
+            TextureStore = new TextureStore(host.Renderer, parent.Get<GameHost>().CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
+            CacheAs(TextureStore = new FallbackTextureStore(host.Renderer, TextureStore, parent.Get<TextureStore>()));
 
-                SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
-                SampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
-                CacheAs(SampleStore = new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
+            SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
+            SampleStore.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
+            CacheAs(SampleStore = new FallbackSampleStore(SampleStore, parent.Get<ISampleStore>()));
 
-                ShaderManager = new ShaderManager(host.Renderer, new NamespacedResourceStore<byte[]>(resources, @"Shaders"));
-                CacheAs(ShaderManager = new FallbackShaderManager(host.Renderer, ShaderManager, parent.Get<ShaderManager>()));
-            }
+            ShaderManager = new ShaderManager(host.Renderer, new NamespacedResourceStore<byte[]>(resources, @"Shaders"));
+            CacheAs(ShaderManager = new FallbackShaderManager(host.Renderer, ShaderManager, parent.Get<ShaderManager>()));
 
             RulesetConfigManager = parent.Get<IRulesetConfigCache>().GetConfigFor(ruleset);
             if (RulesetConfigManager != null)

From 6bf6b7e125639aa3a20d972bb87cf2d712975b41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 13:07:23 +0900
Subject: [PATCH 289/709] Fix null considerations in
 `DrawableRulesetDependencies`

---
 .../UI/DrawableRulesetDependencies.cs         | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 52387a5740..ad52b4affc 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
@@ -44,9 +43,9 @@ namespace osu.Game.Rulesets.UI
         public ShaderManager ShaderManager { get; }
 
         /// <summary>
-        /// The ruleset config manager.
+        /// The ruleset config manager. May be null if ruleset does not expose a configuration manager.
         /// </summary>
-        public IRulesetConfigManager RulesetConfigManager { get; private set; }
+        public IRulesetConfigManager? RulesetConfigManager { get; }
 
         public DrawableRulesetDependencies(Ruleset ruleset, IReadOnlyDependencyContainer parent)
             : base(parent)
@@ -93,10 +92,9 @@ namespace osu.Game.Rulesets.UI
 
             isDisposed = true;
 
-            SampleStore?.Dispose();
-            TextureStore?.Dispose();
-            ShaderManager?.Dispose();
-            RulesetConfigManager = null;
+            if (ShaderManager.IsNotNull()) SampleStore.Dispose();
+            if (TextureStore.IsNotNull()) TextureStore.Dispose();
+            if (ShaderManager.IsNotNull()) ShaderManager.Dispose();
         }
 
         #endregion
@@ -157,7 +155,7 @@ namespace osu.Game.Rulesets.UI
 
             public void Dispose()
             {
-                primary?.Dispose();
+                if (primary.IsNotNull()) primary.Dispose();
             }
         }
 
@@ -182,7 +180,7 @@ namespace osu.Game.Rulesets.UI
             protected override void Dispose(bool disposing)
             {
                 base.Dispose(disposing);
-                primary?.Dispose();
+                if (primary.IsNotNull()) primary.Dispose();
             }
         }
 
@@ -198,12 +196,12 @@ namespace osu.Game.Rulesets.UI
                 this.fallback = fallback;
             }
 
-            public override byte[] LoadRaw(string name) => primary.LoadRaw(name) ?? fallback.LoadRaw(name);
+            public override byte[]? LoadRaw(string name) => primary.LoadRaw(name) ?? fallback.LoadRaw(name);
 
             protected override void Dispose(bool disposing)
             {
                 base.Dispose(disposing);
-                primary?.Dispose();
+                if (primary.IsNotNull()) primary.Dispose();
             }
         }
     }

From d368f37c3ab8c360cd1a31138543118f90fd1625 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 13:50:59 +0900
Subject: [PATCH 290/709] Remove redundant second `Current` set operation

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 13249e37ca..4787b07af8 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -76,8 +76,6 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             base.LoadComplete();
 
-            skinDropdown.Current = skins.CurrentSkinInfo;
-
             realmSubscription = realm.RegisterForNotifications(_ => realm.Realm.All<SkinInfo>()
                                                                          .Where(s => !s.DeletePending)
                                                                          .OrderByDescending(s => s.Protected) // protected skins should be at the top.

From 0fcd9e02f632230d3d1b884e88a5d4c0891f2c9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 14:01:40 +0900
Subject: [PATCH 291/709] Fix skin dropdown not updating correctly when skin is
 changed externally

---
 osu.Game/Database/Live.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Database/Live.cs b/osu.Game/Database/Live.cs
index 52e1d420f7..a21b7f606b 100644
--- a/osu.Game/Database/Live.cs
+++ b/osu.Game/Database/Live.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Database
 
         public bool Equals(Live<T>? other) => ID == other?.ID;
 
+        public override int GetHashCode() => HashCode.Combine(ID);
+
         public override string ToString() => PerformRead(i => i.ToString());
     }
 }

From ac034bffebe3597716bdaf14395452925881549d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 14:21:54 +0900
Subject: [PATCH 292/709] Fix potential crash if multiplayer spectator load is
 aborted early

---
 .../Multiplayer/Spectate/MultiSpectatorPlayer.cs           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 8e79c89685..6e939c3916 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.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.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Game.Beatmaps;
@@ -34,8 +35,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(CancellationToken cancellationToken)
         {
+            // HUD overlay may not be loaded if load has been cancelled early.
+            if (cancellationToken.IsCancellationRequested)
+                return;
+
             HUDOverlay.PlayerSettingsOverlay.Expire();
             HUDOverlay.HoldToQuit.Expire();
         }

From f53507828c0bfdb7909c895a0d921c6de31ef9ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 14:59:30 +0900
Subject: [PATCH 293/709] Rename event to be more generic (and add
 comprehensive xmldoc)

---
 .../Components/HitObjectOrderedSelectionContainer.cs  |  4 ++--
 osu.Game/Screens/Edit/EditorBeatmap.cs                | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 2d8dca9c2d..18bb6284b8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.LoadComplete();
 
-            editorBeatmap.SelectionBlueprintsShouldBeSorted += SortInternal;
+            editorBeatmap.BeatmapReprocessed += SortInternal;
         }
 
         public override void Add(SelectionBlueprint<HitObject> drawable)
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.Dispose(isDisposing);
 
             if (editorBeatmap != null)
-                editorBeatmap.SelectionBlueprintsShouldBeSorted -= SortInternal;
+                editorBeatmap.BeatmapReprocessed -= SortInternal;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 82f2187901..16c0064e80 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -49,9 +49,13 @@ namespace osu.Game.Screens.Edit
         public event Action<HitObject> HitObjectUpdated;
 
         /// <summary>
-        /// Invoked after <see cref="HitObjects"/> is updated during <see cref="UpdateState"/> and blueprints need to be sorted immediately to prevent a crash.
+        /// Invoked after any state changes occurred which triggered a beatmap reprocess via an <see cref="IBeatmapProcessor"/>.
         /// </summary>
-        public event Action SelectionBlueprintsShouldBeSorted;
+        /// <remarks>
+        /// Beatmap processing may change the order of hitobjects. This event gives external components a chance to handle any changes
+        /// not covered by the <see cref="HitObjectAdded"/> / <see cref="HitObjectUpdated"/> / <see cref="HitObjectRemoved"/> events.
+        /// </remarks>
+        public event Action BeatmapReprocessed;
 
         /// <summary>
         /// All currently selected <see cref="HitObject"/>s.
@@ -336,8 +340,7 @@ namespace osu.Game.Screens.Edit
 
             beatmapProcessor?.PostProcess();
 
-            // Signal selection blueprint sorting because it is possible that the beatmap processor changed the order of the selection blueprints
-            SelectionBlueprintsShouldBeSorted?.Invoke();
+            BeatmapReprocessed?.Invoke();
 
             // callbacks may modify the lists so let's be safe about it
             var deletes = batchPendingDeletes.ToArray();

From 608c893b23f2007e6793de9cff1e72aec92fe70b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 15:03:13 +0900
Subject: [PATCH 294/709] Add basic test guarantees

---
 .../Editing/TestSceneSelectionBlueprintDeselection.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs b/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
index 6141e5f31c..5c933468be 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneSelectionBlueprintDeselection.cs
@@ -28,13 +28,17 @@ namespace osu.Game.Tests.Visual.Editing
                 EditorClock.Seek(0);
                 circle1 = new HitCircle();
                 var circle2 = new HitCircle();
+
                 EditorBeatmap.Add(circle1);
                 EditorBeatmap.Add(circle2);
+
                 EditorBeatmap.SelectedHitObjects.Add(circle1);
                 EditorBeatmap.SelectedHitObjects.Add(circle2);
             });
 
             AddStep("delete the first circle", () => EditorBeatmap.Remove(circle1));
+            AddAssert("one hitobject remains", () => EditorBeatmap.HitObjects.Count == 1);
+            AddAssert("one hitobject selected", () => EditorBeatmap.SelectedHitObjects.Count == 1);
         }
 
         [Test]
@@ -63,6 +67,9 @@ namespace osu.Game.Tests.Visual.Editing
                 InputManager.PressKey(Key.Delete);
                 InputManager.ReleaseKey(Key.Delete);
             });
+
+            AddAssert("10 hitobjects remain", () => EditorBeatmap.HitObjects.Count == 10);
+            AddAssert("no hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 0);
         }
     }
 }

From 3490b160563b74ab4a227d1f3a1885d233ab16da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 10 Sep 2022 01:10:55 +0300
Subject: [PATCH 295/709] Add simplified `SoloGameplayLeaderboard`
 implementation

Note that this doesn't support waiting until leaderboard finishes fetching scores.
---
 .../Play/HUD/SoloGameplayLeaderboard.cs       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
new file mode 100644
index 0000000000..20af036ec9
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -0,0 +1,39 @@
+// 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.
+
+#nullable disable
+
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SoloGameplayLeaderboard : GameplayLeaderboard
+    {
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api, ScoreProcessor processor, ILeaderboard leaderboard)
+        {
+            var local = Add(api.LocalUser.Value, true);
+            local.TotalScore.BindTarget = processor.TotalScore;
+            local.Accuracy.BindTarget = processor.Accuracy;
+            local.Combo.BindTarget = processor.Combo;
+
+            foreach (var player in leaderboard.Scores)
+            {
+                // todo: APIUser is pain for IScoreInfo.
+                var score = Add(new APIUser
+                {
+                    Id = player.User.OnlineID,
+                    Username = player.User.Username,
+                }, false);
+
+                score.TotalScore.Value = player.TotalScore;
+                score.Accuracy.Value = player.Accuracy;
+                score.Combo.Value = player.MaxCombo;
+            }
+        }
+    }
+}

From fed9a47866664a689ac6dd0c916e578b7a653970 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 10 Sep 2022 01:12:57 +0300
Subject: [PATCH 296/709] Add test coverage

---
 .../TestSceneSoloGameplayLeaderboard.cs       | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
new file mode 100644
index 0000000000..0ea2271fbf
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -0,0 +1,64 @@
+// 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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Utils;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSoloGameplayLeaderboard : OsuTestScene
+    {
+        [Cached]
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
+
+        private SoloGameplayLeaderboard leaderboard = null!;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            var trackingUser = new APIUser
+            {
+                Username = "local user",
+                Id = 2,
+            };
+
+            Child = leaderboard = new SoloGameplayLeaderboard(trackingUser)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Expanded = { Value = true },
+            };
+
+            leaderboard.ShowScores(createSampleScores());
+        });
+
+        [Test]
+        public void TestLocalUser()
+        {
+            AddSliderStep("score", 0, 1000000, 500000, v => scoreProcessor.TotalScore.Value = v);
+            AddSliderStep("accuracy", 0f, 1f, 0.5f, v => scoreProcessor.Accuracy.Value = v);
+            AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.Combo.Value = v);
+        }
+
+        private static List<ScoreInfo> createSampleScores()
+        {
+            return new[]
+            {
+                new ScoreInfo { User = new APIUser { Username = @"peppy" }, TotalScore = RNG.Next(500000, 1000000) },
+                new ScoreInfo { User = new APIUser { Username = @"smoogipoo" }, TotalScore = RNG.Next(500000, 1000000) },
+                new ScoreInfo { User = new APIUser { Username = @"spaceman_atlas" }, TotalScore = RNG.Next(500000, 1000000) },
+                new ScoreInfo { User = new APIUser { Username = @"frenzibyte" }, TotalScore = RNG.Next(500000, 1000000) },
+                new ScoreInfo { User = new APIUser { Username = @"Susko3" }, TotalScore = RNG.Next(500000, 1000000) },
+            }.Concat(Enumerable.Range(0, 50).Select(i => new ScoreInfo { User = new APIUser { Username = $"User {i + 1}" }, TotalScore = 500000 + i * 10000 })).ToList();
+        }
+    }
+}

From 4c669e2bce8889bef580d5936fa7320f89e83358 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 16:04:38 +0900
Subject: [PATCH 297/709] Track local `Player.Score`'s user rather than using
 `APIProvider`

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   |  9 +++------
 .../Play/HUD/SoloGameplayLeaderboard.cs       | 20 +++++++++----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index f21ce5e36a..16b36a7468 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -1,11 +1,8 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
@@ -31,7 +28,7 @@ namespace osu.Game.Screens.Play.HUD
         private bool requiresScroll;
         private readonly OsuScrollContainer scroll;
 
-        private GameplayLeaderboardScore trackedScore;
+        private GameplayLeaderboardScore? trackedScore;
 
         /// <summary>
         /// Create a new leaderboard.
@@ -77,7 +74,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Whether the player should be tracked on the leaderboard.
         /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
         /// </param>
-        public ILeaderboardScore Add([CanBeNull] APIUser user, bool isTracked)
+        public ILeaderboardScore Add(APIUser? user, bool isTracked)
         {
             var drawable = CreateLeaderboardScoreDrawable(user, isTracked);
 
@@ -108,7 +105,7 @@ namespace osu.Game.Screens.Play.HUD
             scroll.ScrollToStart(false);
         }
 
-        protected virtual GameplayLeaderboardScore CreateLeaderboardScoreDrawable(APIUser user, bool isTracked) =>
+        protected virtual GameplayLeaderboardScore CreateLeaderboardScoreDrawable(APIUser? user, bool isTracked) =>
             new GameplayLeaderboardScore(user, isTracked);
 
         protected override void Update()
diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 20af036ec9..cfe1b4c86a 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -1,10 +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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Scoring;
@@ -14,25 +11,26 @@ namespace osu.Game.Screens.Play.HUD
     public class SoloGameplayLeaderboard : GameplayLeaderboard
     {
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, ScoreProcessor processor, ILeaderboard leaderboard)
+        private void load(Player player, ScoreProcessor processor, ILeaderboard leaderboard)
         {
-            var local = Add(api.LocalUser.Value, true);
+            ILeaderboardScore local = Add(player.Score.ScoreInfo.User, true);
+
             local.TotalScore.BindTarget = processor.TotalScore;
             local.Accuracy.BindTarget = processor.Accuracy;
             local.Combo.BindTarget = processor.Combo;
 
-            foreach (var player in leaderboard.Scores)
+            foreach (var s in leaderboard.Scores)
             {
                 // todo: APIUser is pain for IScoreInfo.
                 var score = Add(new APIUser
                 {
-                    Id = player.User.OnlineID,
-                    Username = player.User.Username,
+                    Id = s.User.OnlineID,
+                    Username = s.User.Username,
                 }, false);
 
-                score.TotalScore.Value = player.TotalScore;
-                score.Accuracy.Value = player.Accuracy;
-                score.Combo.Value = player.MaxCombo;
+                score.TotalScore.Value = s.TotalScore;
+                score.Accuracy.Value = s.Accuracy;
+                score.Combo.Value = s.MaxCombo;
             }
         }
     }

From 368faa00847b9d33011af1d3c331339c0445475b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 16:07:31 +0900
Subject: [PATCH 298/709] Make constructor `protected` in base implementation

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 16b36a7468..8bcc831de7 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -16,9 +16,8 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class GameplayLeaderboard : CompositeDrawable
+    public abstract class GameplayLeaderboard : CompositeDrawable
     {
-        private readonly int maxPanels;
         private readonly Cached sorting = new Cached();
 
         public Bindable<bool> Expanded = new Bindable<bool>();
@@ -30,14 +29,13 @@ namespace osu.Game.Screens.Play.HUD
 
         private GameplayLeaderboardScore? trackedScore;
 
+        private const int max_panels = 8;
+
         /// <summary>
         /// Create a new leaderboard.
         /// </summary>
-        /// <param name="maxPanels">The maximum panels to show at once. Defines the maximum height of this component.</param>
-        public GameplayLeaderboard(int maxPanels = 8)
+        protected GameplayLeaderboard()
         {
-            this.maxPanels = maxPanels;
-
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
 
             InternalChildren = new Drawable[]
@@ -91,7 +89,7 @@ namespace osu.Game.Screens.Play.HUD
             Flow.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => sorting.Invalidate(), true);
 
-            int displayCount = Math.Min(Flow.Count, maxPanels);
+            int displayCount = Math.Min(Flow.Count, max_panels);
             Height = displayCount * (GameplayLeaderboardScore.PANEL_HEIGHT + Flow.Spacing.Y);
             requiresScroll = displayCount != Flow.Count;
 

From d251c0b2acbc5e9e52f0b5f4d800780ac61d35ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 16:36:09 +0900
Subject: [PATCH 299/709] Move leaderboard implementation to `Player` itself

---
 .../Multiplayer/MultiplayerPlayer.cs          | 58 ++++++++-----------
 osu.Game/Screens/Play/Player.cs               | 36 ++++++++++++
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 773e68162e..d6d381d721 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -41,15 +41,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
 
-        private MultiplayerGameplayLeaderboard leaderboard;
-
         private readonly MultiplayerRoomUser[] users;
 
-        private readonly Bindable<bool> leaderboardExpanded = new BindableBool();
-
         private LoadingLayer loadingDisplay;
         private FillFlowContainer leaderboardFlow;
 
+        private MultiplayerGameplayLeaderboard multiplayerLeaderboard;
+
         /// <summary>
         /// Construct a multiplayer player.
         /// </summary>
@@ -81,38 +79,33 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 Spacing = new Vector2(5)
             });
 
-            HUDOverlay.HoldingForHUD.BindValueChanged(_ => updateLeaderboardExpandedState());
-            LocalUserPlaying.BindValueChanged(_ => updateLeaderboardExpandedState(), true);
-
-            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
-            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(users), l =>
-            {
-                if (!LoadedBeatmapSuccessfully)
-                    return;
-
-                leaderboard.Expanded.BindTo(leaderboardExpanded);
-
-                leaderboardFlow.Insert(0, l);
-
-                if (leaderboard.TeamScores.Count >= 2)
-                {
-                    LoadComponentAsync(new GameplayMatchScoreDisplay
-                    {
-                        Team1Score = { BindTarget = leaderboard.TeamScores.First().Value },
-                        Team2Score = { BindTarget = leaderboard.TeamScores.Last().Value },
-                        Expanded = { BindTarget = HUDOverlay.ShowHud },
-                    }, scoreDisplay => leaderboardFlow.Insert(1, scoreDisplay));
-                }
-            });
-
             LoadComponentAsync(new GameplayChatDisplay(Room)
             {
-                Expanded = { BindTarget = leaderboardExpanded },
+                Expanded = { BindTarget = LeaderboardExpandedState },
             }, chat => leaderboardFlow.Insert(2, chat));
 
             HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
         }
 
+        protected override GameplayLeaderboard CreateGameplayLeaderboard() => multiplayerLeaderboard = new MultiplayerGameplayLeaderboard(users);
+
+        protected override void AddLeaderboardToHUD(GameplayLeaderboard leaderboard)
+        {
+            Debug.Assert(leaderboard == multiplayerLeaderboard);
+
+            leaderboardFlow.Insert(0, leaderboard);
+
+            if (multiplayerLeaderboard.TeamScores.Count >= 2)
+            {
+                LoadComponentAsync(new GameplayMatchScoreDisplay
+                {
+                    Team1Score = { BindTarget = multiplayerLeaderboard.TeamScores.First().Value },
+                    Team2Score = { BindTarget = multiplayerLeaderboard.TeamScores.Last().Value },
+                    Expanded = { BindTarget = HUDOverlay.ShowHud },
+                }, scoreDisplay => leaderboardFlow.Insert(1, scoreDisplay));
+            }
+        }
+
         protected override void LoadAsyncComplete()
         {
             base.LoadAsyncComplete();
@@ -167,9 +160,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
-        private void updateLeaderboardExpandedState() =>
-            leaderboardExpanded.Value = !LocalUserPlaying.Value || HUDOverlay.HoldingForHUD.Value;
-
         private void failAndBail(string message = null)
         {
             if (!string.IsNullOrEmpty(message))
@@ -232,8 +222,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(Room.RoomID.Value != null);
 
-            return leaderboard.TeamScores.Count == 2
-                ? new MultiplayerTeamResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem, leaderboard.TeamScores)
+            return multiplayerLeaderboard.TeamScores.Count == 2
+                ? new MultiplayerTeamResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem, multiplayerLeaderboard.TeamScores)
                 : new MultiplayerResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem);
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 91e9c3b58f..3fd57496bb 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -34,6 +34,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 using osu.Game.Users;
@@ -375,6 +376,8 @@ namespace osu.Game.Screens.Play
 
             if (Configuration.AutomaticallySkipIntro)
                 skipIntroOverlay.SkipWhenReady();
+
+            loadLeaderboard();
         }
 
         protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart);
@@ -820,6 +823,39 @@ namespace osu.Game.Screens.Play
             return mouseWheelDisabled.Value && !e.AltPressed;
         }
 
+        #region Gameplay leaderboard
+
+        protected readonly Bindable<bool> LeaderboardExpandedState = new BindableBool();
+
+        private void loadLeaderboard()
+        {
+            HUDOverlay.HoldingForHUD.BindValueChanged(_ => updateLeaderboardExpandedState());
+            LocalUserPlaying.BindValueChanged(_ => updateLeaderboardExpandedState(), true);
+
+            LoadComponentAsync(CreateGameplayLeaderboard(), leaderboard =>
+            {
+                if (!LoadedBeatmapSuccessfully)
+                    return;
+
+                leaderboard.Expanded.BindTo(LeaderboardExpandedState);
+                AddLeaderboardToHUD(leaderboard);
+            });
+        }
+
+        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+        {
+            Anchor = Anchor.BottomLeft,
+            Origin = Anchor.BottomLeft,
+            Margin = new MarginPadding { Bottom = 75, Left = 20 },
+        };
+
+        protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.Add(leaderboard);
+
+        private void updateLeaderboardExpandedState() =>
+            LeaderboardExpandedState.Value = !LocalUserPlaying.Value || HUDOverlay.HoldingForHUD.Value;
+
+        #endregion
+
         #region Fail Logic
 
         protected FailOverlay FailOverlay { get; private set; }

From ac58c222b9d798cc9163b466ca69c092ca95929f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 16:54:03 +0900
Subject: [PATCH 300/709] Allow `DrawableAvatar` to accept an `IUser` for now

---
 osu.Game/Users/Drawables/DrawableAvatar.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index 483106d3f4..155f63dc18 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -14,13 +14,13 @@ namespace osu.Game.Users.Drawables
     [LongRunningLoad]
     public class DrawableAvatar : Sprite
     {
-        private readonly APIUser user;
+        private readonly IUser user;
 
         /// <summary>
         /// A simple, non-interactable avatar sprite for the specified user.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public DrawableAvatar(APIUser user = null)
+        public DrawableAvatar(IUser user = null)
         {
             this.user = user;
 
@@ -33,10 +33,10 @@ namespace osu.Game.Users.Drawables
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            if (user != null && user.Id > 1)
+            if (user != null && user.OnlineID > 1)
                 // TODO: The fallback here should not need to exist. Users should be looked up and populated via UserLookupCache or otherwise
                 // in remaining cases where this is required (chat tabs, local leaderboard), at which point this should be removed.
-                Texture = textures.Get(user.AvatarUrl ?? $@"https://a.ppy.sh/{user.Id}");
+                Texture = textures.Get((user as APIUser)?.AvatarUrl ?? $@"https://a.ppy.sh/{user.OnlineID}");
 
             Texture ??= textures.Get(@"Online/avatar-guest");
         }

From d2b80645ab50a75736f39e4ae652c73cd687fae3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 16:56:19 +0900
Subject: [PATCH 301/709] Change `Leaderboard` to use `IUser` instead of
 `APIUser`

---
 .../Multiplayer/TestSceneMultiSpectatorLeaderboard.cs       | 2 +-
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs     | 2 +-
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs            | 6 +++---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs       | 6 +++---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 5 +++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 9e6941738a..4fda4c1c50 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -120,6 +120,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             => AddStep($"set user {userId} time {time}", () => clocks[userId].CurrentTime = time);
 
         private void assertCombo(int userId, int expectedCombo)
-            => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
+            => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.OnlineID == userId).Combo.Value == expectedCombo);
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 70f498e7f2..13fde4fd72 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -522,7 +522,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private PlayerArea getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerArea>().Single(p => p.UserId == userId);
 
-        private GameplayLeaderboardScore getLeaderboardScore(int userId) => spectatorScreen.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId);
+        private GameplayLeaderboardScore getLeaderboardScore(int userId) => spectatorScreen.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.OnlineID == userId);
 
         private int[] getPlayerIds(int count) => Enumerable.Range(PLAYER_1_ID, count).ToArray();
     }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 8bcc831de7..8b37e0bacb 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Whether the player should be tracked on the leaderboard.
         /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
         /// </param>
-        public ILeaderboardScore Add(APIUser? user, bool isTracked)
+        public ILeaderboardScore Add(IUser? user, bool isTracked)
         {
             var drawable = CreateLeaderboardScoreDrawable(user, isTracked);
 
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Play.HUD
             scroll.ScrollToStart(false);
         }
 
-        protected virtual GameplayLeaderboardScore CreateLeaderboardScoreDrawable(APIUser? user, bool isTracked) =>
+        protected virtual GameplayLeaderboardScore CreateLeaderboardScoreDrawable(IUser? user, bool isTracked) =>
             new GameplayLeaderboardScore(user, isTracked);
 
         protected override void Update()
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 0f007cd1cb..64a470311f 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osu.Game.Utils;
 using osuTK;
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [CanBeNull]
-        public APIUser User { get; }
+        public IUser User { get; }
 
         /// <summary>
         /// Whether this score is the local user or a replay player (and should be focused / always visible).
@@ -103,7 +103,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="user">The score's player.</param>
         /// <param name="tracked">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore([CanBeNull] APIUser user, bool tracked)
+        public GameplayLeaderboardScore([CanBeNull] IUser user, bool tracked)
         {
             User = user;
             Tracked = tracked;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index ac58325060..56756249b3 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -21,6 +21,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.MatchTypes.TeamVersus;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Users;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
@@ -125,11 +126,11 @@ namespace osu.Game.Screens.Play.HUD
             playingUserIds.BindCollectionChanged(playingUsersChanged);
         }
 
-        protected override GameplayLeaderboardScore CreateLeaderboardScoreDrawable(APIUser user, bool isTracked)
+        protected override GameplayLeaderboardScore CreateLeaderboardScoreDrawable(IUser user, bool isTracked)
         {
             var leaderboardScore = base.CreateLeaderboardScoreDrawable(user, isTracked);
 
-            if (UserScores[user.Id].Team is int team)
+            if (UserScores[user.OnlineID].Team is int team)
             {
                 leaderboardScore.BackgroundColour = getTeamColour(team).Lighten(1.2f);
                 leaderboardScore.TextColour = Color4.White;

From 70e6b595f1a7801a2b39e727d378f33dff3e1e5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 17:07:13 +0900
Subject: [PATCH 302/709] Refactor `SoloGameplayLeaderboard` to not read scores
 via DI

Also allows updating scores if they arrive late.
---
 .../Play/HUD/SoloGameplayLeaderboard.cs       | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index cfe1b4c86a..61be602d53 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -1,32 +1,43 @@
 // 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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Users;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SoloGameplayLeaderboard : GameplayLeaderboard
     {
-        [BackgroundDependencyLoader]
-        private void load(Player player, ScoreProcessor processor, ILeaderboard leaderboard)
+        private readonly IUser trackingUser;
+
+        [Resolved]
+        private ScoreProcessor scoreProcessor { get; set; } = null!;
+
+        public SoloGameplayLeaderboard(IUser trackingUser)
         {
-            ILeaderboardScore local = Add(player.Score.ScoreInfo.User, true);
+            this.trackingUser = trackingUser;
+        }
 
-            local.TotalScore.BindTarget = processor.TotalScore;
-            local.Accuracy.BindTarget = processor.Accuracy;
-            local.Combo.BindTarget = processor.Combo;
+        public void ShowScores(IEnumerable<IScoreInfo> scores)
+        {
+            Clear();
 
-            foreach (var s in leaderboard.Scores)
+            if (!scores.Any())
+                return;
+
+            ILeaderboardScore local = Add(trackingUser, true);
+
+            local.TotalScore.BindTarget = scoreProcessor.TotalScore;
+            local.Accuracy.BindTarget = scoreProcessor.Accuracy;
+            local.Combo.BindTarget = scoreProcessor.Combo;
+
+            foreach (var s in scores)
             {
-                // todo: APIUser is pain for IScoreInfo.
-                var score = Add(new APIUser
-                {
-                    Id = s.User.OnlineID,
-                    Username = s.User.Username,
-                }, false);
+                var score = Add(s.User, false);
 
                 score.TotalScore.Value = s.TotalScore;
                 score.Accuracy.Value = s.Accuracy;

From 6d167070f8629558dcbc7f83390c9906e7f4b272 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 17:49:53 +0900
Subject: [PATCH 303/709] Add back DI leaderboard retrieval via bindable
 pathway

---
 .../TestSceneSoloGameplayLeaderboard.cs       | 42 ++++++++++++-------
 .../Leaderboards/ILeaderboardScoreSource.cs   | 15 +++++++
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 15 ++++---
 .../Play/HUD/SoloGameplayLeaderboard.cs       | 15 ++++++-
 .../Select/Leaderboards/BeatmapLeaderboard.cs |  5 ++-
 osu.Game/Screens/Select/PlaySongSelect.cs     | 23 ++++++++--
 6 files changed, 86 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 0ea2271fbf..6839fafa93 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -5,9 +5,12 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -15,31 +18,36 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSoloGameplayLeaderboard : OsuTestScene
+    public class TestSceneSoloGameplayLeaderboard : OsuTestScene, ILeaderboardScoreSource
     {
         [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
 
-        private SoloGameplayLeaderboard leaderboard = null!;
+        private readonly BindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [SetUpSteps]
+        public void SetUpSteps()
         {
-            var trackingUser = new APIUser
-            {
-                Username = "local user",
-                Id = 2,
-            };
+            AddStep("clear scores", () => scores.Clear());
 
-            Child = leaderboard = new SoloGameplayLeaderboard(trackingUser)
+            AddStep("create component", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Expanded = { Value = true },
-            };
+                var trackingUser = new APIUser
+                {
+                    Username = "local user",
+                    Id = 2,
+                };
 
-            leaderboard.ShowScores(createSampleScores());
-        });
+                Child = new SoloGameplayLeaderboard(trackingUser)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Expanded = { Value = true },
+                };
+            });
+
+            AddStep("add scores", () => scores.AddRange(createSampleScores()));
+        }
 
         [Test]
         public void TestLocalUser()
@@ -49,6 +57,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.Combo.Value = v);
         }
 
+        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores => scores;
+
         private static List<ScoreInfo> createSampleScores()
         {
             return new[]
diff --git a/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs b/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs
new file mode 100644
index 0000000000..e7ed43633e
--- /dev/null
+++ b/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs
@@ -0,0 +1,15 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Leaderboards
+{
+    [Cached]
+    public interface ILeaderboardScoreSource
+    {
+        IBindableList<ScoreInfo> Scores { get; }
+    }
+}
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 58b1ea62aa..9b6e9fbec7 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -39,7 +39,9 @@ namespace osu.Game.Online.Leaderboards
         /// <summary>
         /// The currently displayed scores.
         /// </summary>
-        public IEnumerable<TScoreInfo> Scores => scores;
+        public IBindableList<TScoreInfo> Scores => scores;
+
+        private readonly BindableList<TScoreInfo> scores = new BindableList<TScoreInfo>();
 
         /// <summary>
         /// Whether the current scope should refetch in response to changes in API connectivity state.
@@ -68,8 +70,6 @@ namespace osu.Game.Online.Leaderboards
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
-        private ICollection<TScoreInfo> scores;
-
         private TScope scope;
 
         public TScope Scope
@@ -169,7 +169,7 @@ namespace osu.Game.Online.Leaderboards
                     throw new InvalidOperationException($"State {state} cannot be set by a leaderboard implementation.");
             }
 
-            Debug.Assert(scores?.Any() != true);
+            Debug.Assert(scores.Any() != true);
 
             setState(state);
         }
@@ -181,7 +181,10 @@ namespace osu.Game.Online.Leaderboards
         /// <param name="userScore">The user top score, if any.</param>
         protected void SetScores(IEnumerable<TScoreInfo> scores, TScoreInfo userScore = default)
         {
-            this.scores = scores?.ToList();
+            this.scores.Clear();
+            if (scores != null)
+                this.scores.AddRange(scores);
+
             userScoreContainer.Score.Value = userScore;
 
             if (userScore == null)
@@ -247,7 +250,7 @@ namespace osu.Game.Online.Leaderboards
                 .Expire();
             scoreFlowContainer = null;
 
-            if (scores?.Any() != true)
+            if (scores.Any() != true)
             {
                 setState(LeaderboardState.NoScores);
                 return;
diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 61be602d53..a67e59df05 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
@@ -14,6 +16,8 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly IUser trackingUser;
 
+        private readonly IBindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
+
         [Resolved]
         private ScoreProcessor scoreProcessor { get; set; } = null!;
 
@@ -22,7 +26,16 @@ namespace osu.Game.Screens.Play.HUD
             this.trackingUser = trackingUser;
         }
 
-        public void ShowScores(IEnumerable<IScoreInfo> scores)
+        [BackgroundDependencyLoader(true)]
+        private void load(ILeaderboardScoreSource? scoreSource)
+        {
+            if (scoreSource != null)
+                scores.BindTo(scoreSource.Scores);
+
+            scores.BindCollectionChanged((_, __) => Scheduler.AddOnce(showScores, scores), true);
+        }
+
+        private void showScores(IEnumerable<IScoreInfo> scores)
         {
             Clear();
 
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 343b815e9f..ee62160a21 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -23,7 +23,7 @@ using Realms;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
-    public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>
+    public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>, ILeaderboardScoreSource
     {
         public Action<ScoreInfo> ScoreSelected;
 
@@ -152,7 +152,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 SetScores(
                     scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
-                    r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo));
+                    r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+                );
             });
 
             return req;
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index c24ca9a7cf..a4c797a034 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -6,10 +6,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
@@ -22,7 +24,7 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Select
 {
-    public class PlaySongSelect : SongSelect
+    public class PlaySongSelect : SongSelect, ILeaderboardScoreSource
     {
         private OsuScreen playerLoader;
 
@@ -37,14 +39,25 @@ namespace osu.Game.Screens.Select
         private void load(OsuColour colours)
         {
             BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit());
-
-            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += PresentScore;
         }
 
         protected void PresentScore(ScoreInfo score) =>
             FinaliseSelection(score.BeatmapInfo, score.Ruleset, () => this.Push(new SoloResultsScreen(score, false)));
 
-        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+        protected override BeatmapDetailArea CreateBeatmapDetailArea()
+        {
+            var playBeatmapDetailArea = new PlayBeatmapDetailArea
+            {
+                Leaderboard =
+                {
+                    ScoreSelected = PresentScore
+                }
+            };
+
+            Scores.BindTo(playBeatmapDetailArea.Leaderboard.Scores);
+
+            return playBeatmapDetailArea;
+        }
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -121,5 +134,7 @@ namespace osu.Game.Screens.Select
                 playerLoader = null;
             }
         }
+
+        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores { get; } = new BindableList<ScoreInfo>();
     }
 }

From 5894d2f0bca96e4af328dab2c7604b671943c529 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 18:12:49 +0900
Subject: [PATCH 304/709] Ensure gameplay leaderboard hides with rest of HUD
 when it should

---
 .../OnlinePlay/Multiplayer/MultiplayerPlayer.cs      |  3 ++-
 osu.Game/Screens/Play/HUDOverlay.cs                  | 12 ++++++++++--
 osu.Game/Screens/Play/Player.cs                      |  3 ++-
 osu.Game/Screens/Play/PlayerConfiguration.cs         |  5 +++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index d6d381d721..655aa08a72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -60,7 +60,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 AllowPause = false,
                 AllowRestart = false,
                 AllowSkipping = room.AutoSkip.Value,
-                AutomaticallySkipIntro = room.AutoSkip.Value
+                AutomaticallySkipIntro = room.AutoSkip.Value,
+                AlwaysShowLeaderboard = true,
             })
         {
             this.users = users;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index f9f3693385..a727b8925b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -9,7 +9,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
@@ -80,7 +79,7 @@ namespace osu.Game.Screens.Play
 
         private readonly SkinnableTargetContainer mainComponents;
 
-        private IEnumerable<Drawable> hideTargets => new Drawable[] { mainComponents, KeyCounter, topRightElements };
+        private readonly List<Drawable> hideTargets;
 
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {
@@ -129,6 +128,8 @@ namespace osu.Game.Screens.Play
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator()
             };
+
+            hideTargets = new List<Drawable> { mainComponents, KeyCounter, topRightElements };
         }
 
         [BackgroundDependencyLoader(true)]
@@ -173,6 +174,13 @@ namespace osu.Game.Screens.Play
             replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
         }
 
+        public void Add(Drawable drawable, bool hideWithHUD)
+        {
+            base.Add(drawable);
+            if (hideWithHUD)
+                hideTargets.Add(drawable);
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3fd57496bb..659dbd06ef 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -838,6 +838,7 @@ namespace osu.Game.Screens.Play
                     return;
 
                 leaderboard.Expanded.BindTo(LeaderboardExpandedState);
+
                 AddLeaderboardToHUD(leaderboard);
             });
         }
@@ -849,7 +850,7 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Bottom = 75, Left = 20 },
         };
 
-        protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.Add(leaderboard);
+        protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.Add(leaderboard, !Configuration.AlwaysShowLeaderboard);
 
         private void updateLeaderboardExpandedState() =>
             LeaderboardExpandedState.Value = !LocalUserPlaying.Value || HUDOverlay.HoldingForHUD.Value;
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index b1b0e01d80..b82925ccb8 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -36,5 +36,10 @@ namespace osu.Game.Screens.Play
         /// Whether the intro should be skipped by default.
         /// </summary>
         public bool AutomaticallySkipIntro { get; set; }
+
+        /// <summary>
+        /// Whether the gameplay leaderboard should always be shown (usually in a contracted state).
+        /// </summary>
+        public bool AlwaysShowLeaderboard { get; set; }
     }
 }

From 678eec1c674d0d591d08c35e017d197e55f35503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 18:23:47 +0900
Subject: [PATCH 305/709] Move `LeaderboardFlow` to `HUDOverlay` to share
 positioning logic

---
 .../Multiplayer/MultiplayerPlayer.cs          | 34 ++-----------------
 osu.Game/Screens/Play/HUDOverlay.cs           | 34 ++++++++++++++-----
 osu.Game/Screens/Play/Player.cs               | 11 ++----
 3 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 655aa08a72..a2c43898f7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -9,8 +9,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
@@ -21,7 +19,6 @@ using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
@@ -44,7 +41,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private readonly MultiplayerRoomUser[] users;
 
         private LoadingLayer loadingDisplay;
-        private FillFlowContainer leaderboardFlow;
 
         private MultiplayerGameplayLeaderboard multiplayerLeaderboard;
 
@@ -73,17 +69,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!LoadedBeatmapSuccessfully)
                 return;
 
-            HUDOverlay.Add(leaderboardFlow = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(5)
-            });
-
             LoadComponentAsync(new GameplayChatDisplay(Room)
             {
                 Expanded = { BindTarget = LeaderboardExpandedState },
-            }, chat => leaderboardFlow.Insert(2, chat));
+            }, chat => HUDOverlay.LeaderboardFlow.Insert(2, chat));
 
             HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
         }
@@ -94,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(leaderboard == multiplayerLeaderboard);
 
-            leaderboardFlow.Insert(0, leaderboard);
+            HUDOverlay.LeaderboardFlow.Insert(0, leaderboard);
 
             if (multiplayerLeaderboard.TeamScores.Count >= 2)
             {
@@ -103,7 +92,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     Team1Score = { BindTarget = multiplayerLeaderboard.TeamScores.First().Value },
                     Team2Score = { BindTarget = multiplayerLeaderboard.TeamScores.Last().Value },
                     Expanded = { BindTarget = HUDOverlay.ShowHud },
-                }, scoreDisplay => leaderboardFlow.Insert(1, scoreDisplay));
+                }, scoreDisplay => HUDOverlay.LeaderboardFlow.Insert(1, scoreDisplay));
             }
         }
 
@@ -169,23 +158,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Schedule(() => PerformExit(false));
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!LoadedBeatmapSuccessfully)
-                return;
-
-            adjustLeaderboardPosition();
-        }
-
-        private void adjustLeaderboardPosition()
-        {
-            const float padding = 44; // enough margin to avoid the hit error display.
-
-            leaderboardFlow.Position = new Vector2(padding, padding + HUDOverlay.TopScoringElementsHeight);
-        }
-
         private void onGameplayStarted() => Scheduler.Add(() =>
         {
             if (!this.IsCurrentScreen())
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a727b8925b..d08f3fc07f 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -79,9 +79,15 @@ namespace osu.Game.Screens.Play
 
         private readonly SkinnableTargetContainer mainComponents;
 
+        /// <summary>
+        /// A flow which sits at the left side of the screen to house leaderboard (and related) components.
+        /// Will automatically be positioned to avoid colliding with top scoring elements.
+        /// </summary>
+        public readonly FillFlowContainer LeaderboardFlow;
+
         private readonly List<Drawable> hideTargets;
 
-        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
+        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods, bool alwaysShowLeaderboard = true)
         {
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
@@ -126,10 +132,19 @@ namespace osu.Game.Screens.Play
                         HoldToQuit = CreateHoldForMenuButton(),
                     }
                 },
-                clicksPerSecondCalculator = new ClicksPerSecondCalculator()
+                LeaderboardFlow = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5)
+                },
+                clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
             };
 
             hideTargets = new List<Drawable> { mainComponents, KeyCounter, topRightElements };
+
+            if (alwaysShowLeaderboard)
+                hideTargets.Add(LeaderboardFlow);
         }
 
         [BackgroundDependencyLoader(true)]
@@ -174,13 +189,6 @@ namespace osu.Game.Screens.Play
             replayLoaded.BindValueChanged(replayLoadedValueChanged, true);
         }
 
-        public void Add(Drawable drawable, bool hideWithHUD)
-        {
-            base.Add(drawable);
-            if (hideWithHUD)
-                hideTargets.Add(drawable);
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -220,6 +228,14 @@ namespace osu.Game.Screens.Play
                 bottomRightElements.Y = BottomScoringElementsHeight = -MathHelper.Clamp(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y, 0, DrawHeight - bottomRightElements.DrawHeight);
             else
                 bottomRightElements.Y = 0;
+
+            adjustLeaderboardPosition();
+        }
+
+        private void adjustLeaderboardPosition()
+        {
+            const float padding = 44; // enough margin to avoid the hit error display.
+            LeaderboardFlow.Position = new Vector2(padding, padding + TopScoringElementsHeight);
         }
 
         private void updateVisibility()
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 659dbd06ef..95e3e75c8a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -420,7 +420,7 @@ namespace osu.Game.Screens.Play
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                     DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                    HUDOverlay = new HUDOverlay(DrawableRuleset, GameplayState.Mods)
+                    HUDOverlay = new HUDOverlay(DrawableRuleset, GameplayState.Mods, Configuration.AlwaysShowLeaderboard)
                     {
                         HoldToQuit =
                         {
@@ -843,14 +843,9 @@ namespace osu.Game.Screens.Play
             });
         }
 
-        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User)
-        {
-            Anchor = Anchor.BottomLeft,
-            Origin = Anchor.BottomLeft,
-            Margin = new MarginPadding { Bottom = 75, Left = 20 },
-        };
+        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User);
 
-        protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.Add(leaderboard, !Configuration.AlwaysShowLeaderboard);
+        protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.LeaderboardFlow.Add(leaderboard);
 
         private void updateLeaderboardExpandedState() =>
             LeaderboardExpandedState.Value = !LocalUserPlaying.Value || HUDOverlay.HoldingForHUD.Value;

From e15a25ea492061306cff82ef09e58d4f95490b56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 18:42:57 +0900
Subject: [PATCH 306/709] Fix leaderboard positioning logic to actually
 consider elements on the left side

---
 osu.Game/Screens/Play/HUDOverlay.cs | 47 +++++++++++++++++------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index d08f3fc07f..c340f262ed 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -34,11 +34,6 @@ namespace osu.Game.Screens.Play
 
         public const Easing FADE_EASING = Easing.OutQuint;
 
-        /// <summary>
-        /// The total height of all the top of screen scoring elements.
-        /// </summary>
-        public float TopScoringElementsHeight { get; private set; }
-
         /// <summary>
         /// The total height of all the bottom of screen scoring elements.
         /// </summary>
@@ -136,6 +131,7 @@ namespace osu.Game.Screens.Play
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding(44), // enough margin to avoid the hit error display
                     Spacing = new Vector2(5)
                 },
                 clicksPerSecondCalculator = new ClicksPerSecondCalculator(),
@@ -193,22 +189,36 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Vector2? lowestTopScreenSpace = null;
+            float? lowestTopScreenSpaceLeft = null;
+            float? lowestTopScreenSpaceRight = null;
+
             Vector2? highestBottomScreenSpace = null;
 
             // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
                 // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                if (element.Anchor.HasFlagFast(Anchor.TopRight) || (element.Anchor.HasFlagFast(Anchor.y0) && element.RelativeSizeAxes == Axes.X))
+                if (element.Anchor.HasFlagFast(Anchor.y0))
                 {
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
                     if (element is LegacyHealthDisplay)
                         continue;
 
-                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
-                    if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
-                        lowestTopScreenSpace = bottomRight;
+                    float bottom = element.ScreenSpaceDrawQuad.BottomRight.Y;
+
+                    bool isRelativeX = element.RelativeSizeAxes == Axes.X;
+
+                    if (element.Anchor.HasFlagFast(Anchor.TopRight) || isRelativeX)
+                    {
+                        if (lowestTopScreenSpaceRight == null || bottom > lowestTopScreenSpaceRight.Value)
+                            lowestTopScreenSpaceRight = bottom;
+                    }
+
+                    if (element.Anchor.HasFlagFast(Anchor.TopLeft) || isRelativeX)
+                    {
+                        if (lowestTopScreenSpaceLeft == null || bottom > lowestTopScreenSpaceLeft.Value)
+                            lowestTopScreenSpaceLeft = bottom;
+                    }
                 }
                 // and align bottom-right components with the top-edge of the highest bottom-anchored hud element.
                 else if (element.Anchor.HasFlagFast(Anchor.BottomRight) || (element.Anchor.HasFlagFast(Anchor.y2) && element.RelativeSizeAxes == Axes.X))
@@ -219,23 +229,20 @@ namespace osu.Game.Screens.Play
                 }
             }
 
-            if (lowestTopScreenSpace.HasValue)
-                topRightElements.Y = TopScoringElementsHeight = MathHelper.Clamp(ToLocalSpace(lowestTopScreenSpace.Value).Y, 0, DrawHeight - topRightElements.DrawHeight);
+            if (lowestTopScreenSpaceRight.HasValue)
+                topRightElements.Y = MathHelper.Clamp(ToLocalSpace(new Vector2(0, lowestTopScreenSpaceRight.Value)).Y, 0, DrawHeight - topRightElements.DrawHeight);
             else
                 topRightElements.Y = 0;
 
+            if (lowestTopScreenSpaceLeft.HasValue)
+                LeaderboardFlow.Y = MathHelper.Clamp(ToLocalSpace(new Vector2(0, lowestTopScreenSpaceLeft.Value)).Y, 0, DrawHeight - LeaderboardFlow.DrawHeight);
+            else
+                LeaderboardFlow.Y = 0;
+
             if (highestBottomScreenSpace.HasValue)
                 bottomRightElements.Y = BottomScoringElementsHeight = -MathHelper.Clamp(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y, 0, DrawHeight - bottomRightElements.DrawHeight);
             else
                 bottomRightElements.Y = 0;
-
-            adjustLeaderboardPosition();
-        }
-
-        private void adjustLeaderboardPosition()
-        {
-            const float padding = 44; // enough margin to avoid the hit error display.
-            LeaderboardFlow.Position = new Vector2(padding, padding + TopScoringElementsHeight);
         }
 
         private void updateVisibility()

From 9226f0abbca34bd14e6c3571ea7a4426cf9abf57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 19:16:25 +0900
Subject: [PATCH 307/709] Implement equality correctly in `Live`

---
 osu.Game/Database/Live.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/Live.cs b/osu.Game/Database/Live.cs
index a21b7f606b..3bb11c3a50 100644
--- a/osu.Game/Database/Live.cs
+++ b/osu.Game/Database/Live.cs
@@ -51,7 +51,13 @@ namespace osu.Game.Database
             ID = id;
         }
 
-        public bool Equals(Live<T>? other) => ID == other?.ID;
+        public bool Equals(Live<T>? other)
+        {
+            if (ReferenceEquals(this, other)) return true;
+            if (other == null) return false;
+
+            return ID == other.ID;
+        }
 
         public override int GetHashCode() => HashCode.Combine(ID);
 

From 94693a466767179a7307b469e584547e9fe7d990 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 19:55:57 +0900
Subject: [PATCH 308/709] Fix oversight when making interface implementation
 explicit

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index a4c797a034..619ec97535 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -26,15 +24,17 @@ namespace osu.Game.Screens.Select
 {
     public class PlaySongSelect : SongSelect, ILeaderboardScoreSource
     {
-        private OsuScreen playerLoader;
+        private OsuScreen? playerLoader;
 
         [Resolved(CanBeNull = true)]
-        private INotificationOverlay notifications { get; set; }
+        private INotificationOverlay? notifications { get; set; }
 
         public override bool AllowExternalScreenChange => true;
 
         protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap();
 
+        private PlayBeatmapDetailArea playBeatmapDetailArea = null!;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Select
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea()
         {
-            var playBeatmapDetailArea = new PlayBeatmapDetailArea
+            playBeatmapDetailArea = new PlayBeatmapDetailArea
             {
                 Leaderboard =
                 {
@@ -54,8 +54,6 @@ namespace osu.Game.Screens.Select
                 }
             };
 
-            Scores.BindTo(playBeatmapDetailArea.Leaderboard.Scores);
-
             return playBeatmapDetailArea;
         }
 
@@ -74,9 +72,9 @@ namespace osu.Game.Screens.Select
             return base.OnKeyDown(e);
         }
 
-        private IReadOnlyList<Mod> modsAtGameplayStart;
+        private IReadOnlyList<Mod>? modsAtGameplayStart;
 
-        private ModAutoplay getAutoplayMod() => Ruleset.Value.CreateInstance().GetAutoplayMod();
+        private ModAutoplay? getAutoplayMod() => Ruleset.Value.CreateInstance().GetAutoplayMod();
 
         protected override bool OnStart()
         {
@@ -135,6 +133,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores { get; } = new BindableList<ScoreInfo>();
+        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores => playBeatmapDetailArea.Leaderboard.Scores;
     }
 }

From 81b5e4a8654513937945301029f596abc8ee123a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Sep 2022 19:57:40 +0900
Subject: [PATCH 309/709] Fix back-to-front condition on leaderboard always
 show configuration

---
 osu.Game/Screens/Play/HUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c340f262ed..3e661e76f4 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Play
 
             hideTargets = new List<Drawable> { mainComponents, KeyCounter, topRightElements };
 
-            if (alwaysShowLeaderboard)
+            if (!alwaysShowLeaderboard)
                 hideTargets.Add(LeaderboardFlow);
         }
 

From 04dbb6fc1b61e8e3be64484b079d7c20d0b26127 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Sep 2022 00:49:02 +0300
Subject: [PATCH 310/709] Add inline comment

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 70c6c60ecd..2be328427b 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,9 @@ namespace osu.Game.Overlays
             }
             else
             {
+                // new results may contain beatmaps from a previous page,
+                // this is dodgy but matches web behaviour for now.
+                // see: https://github.com/ppy/osu-web/issues/9270
                 newCards = newCards.Except(foundContent);
 
                 panelLoadTask = LoadComponentsAsync(newCards, loaded =>

From b4e6a20846d10ddd8a2590d0fd5b8701ef9e5294 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 12:59:04 +0900
Subject: [PATCH 311/709] Fix song select status prefix matching no longer
 working

Regressed in #19275 due to weird logic.
Closes #20289.
---
 .../NonVisual/Filtering/FilterQueryParserTest.cs       | 10 ++++++++++
 osu.Game/Screens/Select/FilterQueryParser.cs           |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index ac16c59e5b..da32edb8fb 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -191,6 +191,16 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.IsTrue(filterCriteria.BeatDivisor.IsUpperInclusive);
         }
 
+        [Test]
+        public void TestPartialStatusMatch()
+        {
+            const string query = "status=r";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Min);
+            Assert.AreEqual(BeatmapOnlineStatus.Ranked, filterCriteria.OnlineStatus.Max);
+        }
+
         [Test]
         public void TestApplyStatusQueries()
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index a7c1aec361..c86554ddbc 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -122,14 +122,17 @@ namespace osu.Game.Screens.Select
 
         private static bool tryParseEnum<TEnum>(string value, out TEnum result) where TEnum : struct
         {
-            if (Enum.TryParse(value, true, out result)) return true;
+            // First try an exact match.
+            if (Enum.TryParse(value, true, out result))
+                return true;
 
+            // Then try a prefix match.
             string? prefixMatch = Enum.GetNames(typeof(TEnum)).FirstOrDefault(name => name.StartsWith(value, true, CultureInfo.InvariantCulture));
 
             if (prefixMatch == null)
                 return false;
 
-            return Enum.TryParse(value, true, out result);
+            return Enum.TryParse(prefixMatch, true, out result);
         }
 
         private static GroupCollection? tryMatchRegex(string value, string regex)

From 85e3a681b12e79b8cb12b6b8551bb3eea7e28566 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 13 Sep 2022 21:07:30 -0700
Subject: [PATCH 312/709] Fix notification overlay toast tray background
 absorbing input from behind

---
 osu.Game/Overlays/NotificationOverlayToastTray.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/NotificationOverlayToastTray.cs b/osu.Game/Overlays/NotificationOverlayToastTray.cs
index e3f8734581..329379de4a 100644
--- a/osu.Game/Overlays/NotificationOverlayToastTray.cs
+++ b/osu.Game/Overlays/NotificationOverlayToastTray.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays
     {
         public override bool IsPresent => toastContentBackground.Height > 0 || toastFlow.Count > 0;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => toastFlow.ReceivePositionalInputAt(screenSpacePos);
+
         public bool IsDisplayingToasts => toastFlow.Count > 0;
 
         private FillFlowContainer<Notification> toastFlow = null!;

From 8a6977213a285344f81a987af80cd0d6337ac243 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 14:02:35 +0900
Subject: [PATCH 313/709] Fix displayed scores in gameplay leaderboard not
 tracking display mode changes

---
 .../Play/HUD/SoloGameplayLeaderboard.cs        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index a67e59df05..2282277c3c 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -18,9 +18,15 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly IBindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
 
+        // hold references to ensure bindables are updated.
+        private readonly List<Bindable<long>> scoreBindables = new List<Bindable<long>>();
+
         [Resolved]
         private ScoreProcessor scoreProcessor { get; set; } = null!;
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; } = null!;
+
         public SoloGameplayLeaderboard(IUser trackingUser)
         {
             this.trackingUser = trackingUser;
@@ -32,12 +38,13 @@ namespace osu.Game.Screens.Play.HUD
             if (scoreSource != null)
                 scores.BindTo(scoreSource.Scores);
 
-            scores.BindCollectionChanged((_, __) => Scheduler.AddOnce(showScores, scores), true);
+            scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
         }
 
-        private void showScores(IEnumerable<IScoreInfo> scores)
+        private void showScores()
         {
             Clear();
+            scoreBindables.Clear();
 
             if (!scores.Any())
                 return;
@@ -52,7 +59,12 @@ namespace osu.Game.Screens.Play.HUD
             {
                 var score = Add(s.User, false);
 
-                score.TotalScore.Value = s.TotalScore;
+                var bindableTotal = scoreManager.GetBindableTotalScore(s);
+
+                // Direct binding not possible due to differing types (see https://github.com/ppy/osu/issues/20298).
+                bindableTotal.BindValueChanged(total => score.TotalScore.Value = total.NewValue, true);
+                scoreBindables.Add(bindableTotal);
+
                 score.Accuracy.Value = s.Accuracy;
                 score.Combo.Value = s.MaxCombo;
             }

From fcf54f1bc80ce018e9247fe5ecd7835e6488fb6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 14:18:12 +0900
Subject: [PATCH 314/709] Fix gameplay leaderboard not being sorted correctly
 in tie situations

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs      | 6 +++++-
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 1 +
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs        | 6 ++++++
 osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs  | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 8b37e0bacb..325253e9d4 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Screens.Play.HUD
 
             Flow.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => sorting.Invalidate(), true);
+            drawable.DisplayOrder.BindValueChanged(_ => sorting.Invalidate(), true);
 
             int displayCount = Math.Min(Flow.Count, max_panels);
             Height = displayCount * (GameplayLeaderboardScore.PANEL_HEIGHT + Flow.Spacing.Y);
@@ -160,7 +161,10 @@ namespace osu.Game.Screens.Play.HUD
             if (sorting.IsValid)
                 return;
 
-            var orderedByScore = Flow.OrderByDescending(i => i.TotalScore.Value).ToList();
+            var orderedByScore = Flow
+                                 .OrderByDescending(i => i.TotalScore.Value)
+                                 .ThenBy(i => i.DisplayOrder.Value)
+                                 .ToList();
 
             for (int i = 0; i < Flow.Count; i++)
             {
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 64a470311f..29354e610d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Screens.Play.HUD
         public BindableDouble Accuracy { get; } = new BindableDouble(1);
         public BindableInt Combo { get; } = new BindableInt();
         public BindableBool HasQuit { get; } = new BindableBool();
+        public Bindable<long> DisplayOrder { get; } = new Bindable<long>();
 
         public Color4? BackgroundColour { get; set; }
 
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index 20bf7045b8..aa06bb08a5 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -14,5 +14,11 @@ namespace osu.Game.Screens.Play.HUD
         BindableInt Combo { get; }
 
         BindableBool HasQuit { get; }
+
+        /// <summary>
+        /// An optional value to guarantee stable ordering.
+        /// Lower numbers will appear higher in cases of <see cref="TotalScore"/> ties.
+        /// </summary>
+        Bindable<long> DisplayOrder { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 2282277c3c..6141260beb 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -55,6 +55,9 @@ namespace osu.Game.Screens.Play.HUD
             local.Accuracy.BindTarget = scoreProcessor.Accuracy;
             local.Combo.BindTarget = scoreProcessor.Combo;
 
+            // Local score should always show lower than any existing scores in cases of ties.
+            local.DisplayOrder.Value = long.MaxValue;
+
             foreach (var s in scores)
             {
                 var score = Add(s.User, false);
@@ -67,6 +70,7 @@ namespace osu.Game.Screens.Play.HUD
 
                 score.Accuracy.Value = s.Accuracy;
                 score.Combo.Value = s.MaxCombo;
+                score.DisplayOrder.Value = s.OnlineID > 0 ? s.OnlineID : s.Date.ToUnixTimeSeconds();
             }
         }
     }

From bc07513c3c19f4440676aff013b111eec321ad50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 14:19:53 +0900
Subject: [PATCH 315/709] Fix local scores potentially not being stable-sorted
 for leaderboard display

---
 osu.Game/Scoring/ScoreManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 6bb31eb4db..8342d3bcc1 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -58,7 +58,10 @@ namespace osu.Game.Scoring
         /// <param name="scores">The array of <see cref="ScoreInfo"/>s to reorder.</param>
         /// <returns>The given <paramref name="scores"/> ordered by decreasing total score.</returns>
         public IEnumerable<ScoreInfo> OrderByTotalScore(IEnumerable<ScoreInfo> scores)
-            => scores.OrderByDescending(s => GetTotalScore(s)).ThenBy(s => s.OnlineID);
+            => scores.OrderByDescending(s => GetTotalScore(s))
+                     .ThenBy(s => s.OnlineID)
+                     // Local scores may not have an online ID. Fall back to date in these cases.
+                     .ThenBy(s => s.Date);
 
         /// <summary>
         /// Retrieves a bindable that represents the total score of a <see cref="ScoreInfo"/>.

From 30cf14e824bc0eeb9f01f0eeb63eb91462c7954e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 14 Sep 2022 14:40:45 +0900
Subject: [PATCH 316/709] Update ReSharper CLI to 2022.2.3

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 57694d7f57..1f937e1837 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2022.1.1",
+      "version": "2022.2.3",
       "commands": [
         "jb"
       ]

From a9eba2712991229a99e1f1b80c85d92e720a8264 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 15 Jun 2021 19:41:37 +0900
Subject: [PATCH 317/709] Factor out pooling logic from `Playfield`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 69 +++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs             | 49 +++++++------
 2 files changed, 98 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
new file mode 100644
index 0000000000..129c4cab44
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -0,0 +1,69 @@
+// 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.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace osu.Game.Rulesets.Objects.Pooling
+{
+    /// <summary>
+    /// Manages a mapping between <see cref="HitObject"/> and <see cref="HitObjectLifetimeEntry"/>
+    /// </summary>
+    internal class HitObjectEntryManager
+    {
+        /// <summary>
+        /// All entries, including entries of the nested hit objects.
+        /// </summary>
+        public IEnumerable<HitObjectLifetimeEntry> AllEntries => entryMap.Values;
+
+        public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryAdded;
+        public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
+
+        private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
+
+        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+        private readonly Dictionary<HitObject, HitObject> parentMap = new Dictionary<HitObject, HitObject>();
+
+        public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
+        {
+            this.createLifetimeEntry = createLifetimeEntry;
+        }
+
+        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parentHitObject)
+        {
+            if (parentHitObject != null && !entryMap.TryGetValue(parentHitObject, out var parentEntry))
+                throw new InvalidOperationException($@"The parent {nameof(HitObject)} must be added to this {nameof(HitObjectEntryManager)} before nested {nameof(HitObject)} is added.");
+
+            if (entryMap.ContainsKey(hitObject))
+                throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
+
+            if (parentHitObject != null)
+                parentMap[hitObject] = parentHitObject;
+
+            var entry = createLifetimeEntry(hitObject);
+            entryMap[hitObject] = entry;
+
+            OnEntryAdded?.Invoke(entry, parentHitObject);
+            return entry;
+        }
+
+        public bool Remove(HitObject hitObject)
+        {
+            if (!entryMap.TryGetValue(hitObject, out var entry))
+                return false;
+
+            parentMap.Remove(hitObject, out var parentHitObject);
+
+            OnEntryRemoved?.Invoke(entry, parentHitObject);
+            return true;
+        }
+
+        public bool TryGet(HitObject hitObject, [MaybeNullWhen(false)] out HitObjectLifetimeEntry entry)
+        {
+            return entryMap.TryGetValue(hitObject, out entry);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 60d1555052..5aaa7682db 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
+using osu.Game.Rulesets.Objects.Pooling;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -94,6 +95,8 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
+        private readonly HitObjectEntryManager entryManager;
+
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>
@@ -108,6 +111,10 @@ namespace osu.Game.Rulesets.UI
                 h.HitObjectUsageBegan += o => HitObjectUsageBegan?.Invoke(o);
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
+
+            entryManager = new HitObjectEntryManager(CreateLifetimeEntry);
+            entryManager.OnEntryAdded += onEntryAdded;
+            entryManager.OnEntryRemoved += onEntryRemoved;
         }
 
         [BackgroundDependencyLoader]
@@ -171,6 +178,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject">The added <see cref="HitObject"/>.</param>
         protected virtual void OnHitObjectAdded(HitObject hitObject)
         {
+            preloadSamples(hitObject);
         }
 
         /// <summary>
@@ -263,13 +271,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject"></param>
         public virtual void Add(HitObject hitObject)
         {
-            var entry = CreateLifetimeEntry(hitObject);
-            lifetimeEntryMap[entry.HitObject] = entry;
-
-            preloadSamples(hitObject);
-
-            HitObjectContainer.Add(entry);
-            OnHitObjectAdded(entry.HitObject);
+            entryManager.Add(hitObject, null);
         }
 
         private void preloadSamples(HitObject hitObject)
@@ -292,14 +294,23 @@ namespace osu.Game.Rulesets.UI
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
         public virtual bool Remove(HitObject hitObject)
         {
-            if (lifetimeEntryMap.Remove(hitObject, out var entry))
-            {
-                HitObjectContainer.Remove(entry);
-                OnHitObjectRemoved(hitObject);
-                return true;
-            }
+            return entryManager.Remove(hitObject) || nestedPlayfields.Any(p => p.Remove(hitObject));
+        }
 
-            return nestedPlayfields.Any(p => p.Remove(hitObject));
+        private void onEntryAdded(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
+        {
+            if (parentHitObject != null) return;
+
+            HitObjectContainer.Add(entry);
+            OnHitObjectAdded(entry.HitObject);
+        }
+
+        private void onEntryRemoved(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
+        {
+            if (parentHitObject != null) return;
+
+            HitObjectContainer.Remove(entry);
+            OnHitObjectRemoved(entry.HitObject);
         }
 
         /// <summary>
@@ -366,8 +377,8 @@ namespace osu.Game.Rulesets.UI
                     }
                 }
 
-                if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))
-                    lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
+                if (!entryManager.TryGet(hitObject, out var entry))
+                    entry = entryManager.Add(hitObject, parent?.HitObject);
 
                 dho.ParentHitObject = parent;
                 dho.Apply(entry);
@@ -442,8 +453,6 @@ namespace osu.Game.Rulesets.UI
         /// </remarks>
         internal event Action<HitObject> HitObjectUsageFinished;
 
-        private readonly Dictionary<HitObject, HitObjectLifetimeEntry> lifetimeEntryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-
         /// <summary>
         /// Sets whether to keep a given <see cref="HitObject"/> always alive within this or any nested <see cref="Playfield"/>.
         /// </summary>
@@ -451,7 +460,7 @@ namespace osu.Game.Rulesets.UI
         /// <param name="keepAlive">Whether to keep <paramref name="hitObject"/> always alive.</param>
         internal void SetKeepAlive(HitObject hitObject, bool keepAlive)
         {
-            if (lifetimeEntryMap.TryGetValue(hitObject, out var entry))
+            if (entryManager.TryGet(hitObject, out var entry))
             {
                 entry.KeepAlive = keepAlive;
                 return;
@@ -466,7 +475,7 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         internal void KeepAllAlive()
         {
-            foreach (var (_, entry) in lifetimeEntryMap)
+            foreach (var entry in entryManager.AllEntries)
                 entry.KeepAlive = true;
 
             foreach (var p in nestedPlayfields)

From bde390828b017f3d62698f263ec14a962d05ad19 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 15 Jun 2021 20:48:00 +0900
Subject: [PATCH 318/709] Manage entries of nested hit objects in
 `HitObjectEntryManager`

- Fix nested hit objects are leaked when parent hit object is edited or deleted
---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 54 ++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 129c4cab44..f14f8b6f61 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -25,39 +25,54 @@ namespace osu.Game.Rulesets.Objects.Pooling
         private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
 
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
-        private readonly Dictionary<HitObject, HitObject> parentMap = new Dictionary<HitObject, HitObject>();
+        private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+        private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
         public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
         {
             this.createLifetimeEntry = createLifetimeEntry;
         }
 
-        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parentHitObject)
+        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parent)
         {
-            if (parentHitObject != null && !entryMap.TryGetValue(parentHitObject, out var parentEntry))
-                throw new InvalidOperationException($@"The parent {nameof(HitObject)} must be added to this {nameof(HitObjectEntryManager)} before nested {nameof(HitObject)} is added.");
-
             if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-            if (parentHitObject != null)
-                parentMap[hitObject] = parentHitObject;
-
             var entry = createLifetimeEntry(hitObject);
             entryMap[hitObject] = entry;
+            parentMap[entry] = parent;
 
-            OnEntryAdded?.Invoke(entry, parentHitObject);
+            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+                parentChildEntries.Add(entry);
+
+            hitObject.DefaultsApplied += onDefaultsApplied;
+
+            childrenMap[entry.HitObject] = new List<HitObjectLifetimeEntry>();
+
+            OnEntryAdded?.Invoke(entry, parent);
             return entry;
         }
 
         public bool Remove(HitObject hitObject)
         {
-            if (!entryMap.TryGetValue(hitObject, out var entry))
+            if (!entryMap.Remove(hitObject, out var entry))
                 return false;
 
-            parentMap.Remove(hitObject, out var parentHitObject);
+            parentMap.Remove(entry, out var parent);
 
-            OnEntryRemoved?.Invoke(entry, parentHitObject);
+            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+                parentChildEntries.Remove(entry);
+
+            hitObject.DefaultsApplied -= onDefaultsApplied;
+
+            // Remove all entries of the nested hit objects
+            if (childrenMap.Remove(entry.HitObject, out var childEntries))
+            {
+                foreach (var childEntry in childEntries)
+                    Remove(childEntry.HitObject);
+            }
+
+            OnEntryRemoved?.Invoke(entry, parent);
             return true;
         }
 
@@ -65,5 +80,20 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             return entryMap.TryGetValue(hitObject, out entry);
         }
+
+        /// <summary>
+        /// As nested hit objects are recreated, remove entries of the old nested hit objects.
+        /// </summary>
+        private void onDefaultsApplied(HitObject hitObject)
+        {
+            if (!childrenMap.Remove(hitObject, out var childEntries))
+                return;
+
+            foreach (var entry in childEntries)
+                Remove(entry.HitObject);
+
+            childEntries.Clear();
+            childrenMap[hitObject] = childEntries;
+        }
     }
 }

From 47539e2129d85e50866e659e850d8bc769927057 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 16 Jun 2021 15:09:01 +0900
Subject: [PATCH 319/709] Add doc comments to `HitObjectEntryManager`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index f14f8b6f61..71c0a88616 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -19,13 +19,38 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public IEnumerable<HitObjectLifetimeEntry> AllEntries => entryMap.Values;
 
+        /// <summary>
+        /// Invoked when a new <see cref="HitObjectLifetimeEntry"/> is added to this <see cref="HitObjectEntryManager"/>..
+        /// The second parameter of the event is the parent hit object.
+        /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryAdded;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObjectLifetimeEntry"/> is removed from this <see cref="HitObjectEntryManager"/>.
+        /// The second parameter of the event is the parent hit object.
+        /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
 
         private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
 
+        /// <summary>
+        /// Provides the reverse mapping of <see cref="HitObjectLifetimeEntry.HitObject"/> for each entry.
+        /// </summary>
         private readonly Dictionary<HitObject, HitObjectLifetimeEntry> entryMap = new Dictionary<HitObject, HitObjectLifetimeEntry>();
+
+        /// <summary>
+        /// Stores the parent hit object for entries of the nested hit objects.
+        /// A <c>null</c> is stored for entries of the top-level hit objects.
+        /// </summary>
+        /// <remarks>
+        /// The parent hit object of a pooled hit object may be non-pooled.
+        /// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>.
+        /// </remarks>
         private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+
+        /// <summary>
+        /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
+        /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
         public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)

From c59aa574509d153883fc6dd6f4627058a7089e27 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 16 Jun 2021 15:15:33 +0900
Subject: [PATCH 320/709] Remove `createLifetimeEntry` from
 `HitObjectEntryManager`

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 33 ++++++++-----------
 osu.Game/Rulesets/UI/Playfield.cs             | 19 ++++++++---
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 71c0a88616..d8dd6fab7e 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public event Action<HitObjectLifetimeEntry, HitObject?>? OnEntryRemoved;
 
-        private readonly Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry;
-
         /// <summary>
         /// Provides the reverse mapping of <see cref="HitObjectLifetimeEntry.HitObject"/> for each entry.
         /// </summary>
@@ -53,37 +51,33 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 
-        public HitObjectEntryManager(Func<HitObject, HitObjectLifetimeEntry> createLifetimeEntry)
+        public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
         {
-            this.createLifetimeEntry = createLifetimeEntry;
-        }
+            if (parentMap.ContainsKey(entry))
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-        public HitObjectLifetimeEntry Add(HitObject hitObject, HitObject? parent)
-        {
-            if (entryMap.ContainsKey(hitObject))
-                throw new InvalidOperationException($@"The {nameof(HitObject)} is already added to this {nameof(HitObjectEntryManager)}.");
-
-            var entry = createLifetimeEntry(hitObject);
-            entryMap[hitObject] = entry;
+            var hitObject = entry.HitObject;
             parentMap[entry] = parent;
+            entryMap[hitObject] = entry;
 
             if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Add(entry);
 
             hitObject.DefaultsApplied += onDefaultsApplied;
 
-            childrenMap[entry.HitObject] = new List<HitObjectLifetimeEntry>();
+            childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
             OnEntryAdded?.Invoke(entry, parent);
-            return entry;
         }
 
-        public bool Remove(HitObject hitObject)
+        public void Remove(HitObjectLifetimeEntry entry)
         {
-            if (!entryMap.Remove(hitObject, out var entry))
-                return false;
+            if (!parentMap.ContainsKey(entry))
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
+            var hitObject = entry.HitObject;
             parentMap.Remove(entry, out var parent);
+            entryMap.Remove(hitObject);
 
             if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
@@ -94,11 +88,10 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (childrenMap.Remove(entry.HitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
-                    Remove(childEntry.HitObject);
+                    Remove(childEntry);
             }
 
             OnEntryRemoved?.Invoke(entry, parent);
-            return true;
         }
 
         public bool TryGet(HitObject hitObject, [MaybeNullWhen(false)] out HitObjectLifetimeEntry entry)
@@ -115,7 +108,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 return;
 
             foreach (var entry in childEntries)
-                Remove(entry.HitObject);
+                Remove(entry);
 
             childEntries.Clear();
             childrenMap[hitObject] = childEntries;
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 5aaa7682db..2ec72d8fe3 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
-        private readonly HitObjectEntryManager entryManager;
+        private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
 
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
@@ -112,7 +112,6 @@ namespace osu.Game.Rulesets.UI
                 h.HitObjectUsageFinished += o => HitObjectUsageFinished?.Invoke(o);
             }));
 
-            entryManager = new HitObjectEntryManager(CreateLifetimeEntry);
             entryManager.OnEntryAdded += onEntryAdded;
             entryManager.OnEntryRemoved += onEntryRemoved;
         }
@@ -271,7 +270,8 @@ namespace osu.Game.Rulesets.UI
         /// <param name="hitObject"></param>
         public virtual void Add(HitObject hitObject)
         {
-            entryManager.Add(hitObject, null);
+            var entry = CreateLifetimeEntry(hitObject);
+            entryManager.Add(entry, null);
         }
 
         private void preloadSamples(HitObject hitObject)
@@ -294,7 +294,13 @@ namespace osu.Game.Rulesets.UI
         /// <returns>Whether the <see cref="HitObject"/> was successfully removed.</returns>
         public virtual bool Remove(HitObject hitObject)
         {
-            return entryManager.Remove(hitObject) || nestedPlayfields.Any(p => p.Remove(hitObject));
+            if (entryManager.TryGet(hitObject, out var entry))
+            {
+                entryManager.Remove(entry);
+                return true;
+            }
+
+            return nestedPlayfields.Any(p => p.Remove(hitObject));
         }
 
         private void onEntryAdded(HitObjectLifetimeEntry entry, [CanBeNull] HitObject parentHitObject)
@@ -378,7 +384,10 @@ namespace osu.Game.Rulesets.UI
                 }
 
                 if (!entryManager.TryGet(hitObject, out var entry))
-                    entry = entryManager.Add(hitObject, parent?.HitObject);
+                {
+                    entry = CreateLifetimeEntry(hitObject);
+                    entryManager.Add(entry, parent?.HitObject);
+                }
 
                 dho.ParentHitObject = parent;
                 dho.Apply(entry);

From 5dc0d32e4207199f93c0d2f054f3d145952ab066 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Sep 2022 15:24:20 +0900
Subject: [PATCH 321/709] Apply NRT to hitobject lifetime related classes

---
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs        | 4 +---
 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 9af4cf3544..fedf419973 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Performance;
 using osu.Game.Rulesets.Judgements;
@@ -24,7 +22,7 @@ namespace osu.Game.Rulesets.Objects
         /// The result that <see cref="HitObject"/> was judged with.
         /// This is set by the accompanying <see cref="DrawableHitObject"/>, and reused when required for rewinding.
         /// </summary>
-        internal JudgementResult Result;
+        internal JudgementResult? Result;
 
         private readonly IBindable<double> startTimeBindable = new BindableDouble();
 
diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index d8dd6fab7e..30a8e8f549 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable enable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

From 1801ae3c6a16b20fd4ec7ad7e7741919566c083c Mon Sep 17 00:00:00 2001
From: StanR <hi@stanr.info>
Date: Wed, 14 Sep 2022 17:40:22 +0300
Subject: [PATCH 322/709] Move flashlight TD difficulty reduction to diffcalc

---
 .../Difficulty/OsuDifficultyCalculator.cs                  | 3 +++
 .../Difficulty/OsuPerformanceCalculator.cs                 | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 295fefffa3..fd4a21bb76 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -46,7 +46,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
 
             if (mods.Any(m => m is OsuModTouchDevice))
+            {
                 aimRating = Math.Pow(aimRating, 0.8);
+                flashlightRating = Math.Pow(flashlightRating, 0.8);
+            }
 
             if (mods.Any(h => h is OsuModRelax))
             {
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2b0e2db898..30b56ff769 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -228,12 +228,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (!score.Mods.Any(h => h is OsuModFlashlight))
                 return 0.0;
 
-            double rawFlashlight = attributes.FlashlightDifficulty;
-
-            if (score.Mods.Any(m => m is OsuModTouchDevice))
-                rawFlashlight = Math.Pow(rawFlashlight, 0.8);
-
-            double flashlightValue = Math.Pow(rawFlashlight, 2.0) * 25.0;
+            double flashlightValue = Math.Pow(attributes.FlashlightDifficulty, 2.0) * 25.0;
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (effectiveMissCount > 0)

From 87384db8729401b7b6824880cd5cc95eeefa9126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 00:51:02 +0900
Subject: [PATCH 323/709] Fix slider rotation causing thousands of new
 drawables to be created

---
 .../Sliders/Components/PathControlPointPiece.cs          | 7 +++++--
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs        | 9 ++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index ab4b492767..59edbe8dc6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -66,11 +66,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             cachePoints(slider);
 
             sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ =>
+
+            // schedule ensure that updates are only applied after all operations from a single frame are applied.
+            // this avoids inadvertently changing the slider path type for bach operations.
+            sliderVersion.BindValueChanged(_ => Scheduler.AddOnce(() =>
             {
                 cachePoints(slider);
                 updatePathType();
-            });
+            }));
 
             controlPoint.Changed += updateMarkerDisplay;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 57d67acad5..280a35500a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -186,13 +186,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 if (h is IHasPath path)
                 {
-                    var controlPoints = path.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(RotatePointAroundOrigin(p.Position, Vector2.Zero, delta), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    path.Path.ControlPoints.Clear();
-                    path.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (PathControlPoint t in path.Path.ControlPoints)
+                        t.Position = RotatePointAroundOrigin(t.Position, Vector2.Zero, delta);
                 }
             }
 

From d6db82283a806ab62114ee3c830cd15152a5a1ef Mon Sep 17 00:00:00 2001
From: Mk-56spn <darioheadleysilva@gmail.com>
Date: Wed, 14 Sep 2022 18:01:29 +0200
Subject: [PATCH 324/709] Removes unused class

---
 osu.Game/Screens/Play/KeyCounterState.cs | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/KeyCounterState.cs

diff --git a/osu.Game/Screens/Play/KeyCounterState.cs b/osu.Game/Screens/Play/KeyCounterState.cs
deleted file mode 100644
index 45d027e5ec..0000000000
--- a/osu.Game/Screens/Play/KeyCounterState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.
-
-#nullable disable
-
-namespace osu.Game.Screens.Play
-{
-    public class KeyCounterState
-    {
-        public KeyCounterState(double time, int count)
-        {
-            Time = time;
-            Count = count;
-        }
-
-        public readonly double Time;
-        public readonly int Count;
-    }
-}

From c203a030c1bdec9b40168b1ca8844c802436b4d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 04:28:07 +0900
Subject: [PATCH 325/709] Update
 osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs

Co-authored-by: apollo <83023433+apollo-dw@users.noreply.github.com>
---
 .../Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 59edbe8dc6..5dec5d1cb0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             sliderVersion = slider.Path.Version.GetBoundCopy();
 
             // schedule ensure that updates are only applied after all operations from a single frame are applied.
-            // this avoids inadvertently changing the slider path type for bach operations.
+            // this avoids inadvertently changing the slider path type for batch operations.
             sliderVersion.BindValueChanged(_ => Scheduler.AddOnce(() =>
             {
                 cachePoints(slider);

From de7dd29d791304fe588ae1f297ecff8e128168c4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:57:05 +0300
Subject: [PATCH 326/709] Add "Nominations" and "Updated" sorting criteria in
 beatmap listing

---
 osu.Game/Overlays/BeatmapListing/SortCriteria.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
index ff6e62b274..6c010c7504 100644
--- a/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
+++ b/osu.Game/Overlays/BeatmapListing/SortCriteria.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Overlays.BeatmapListing
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingDifficulty))]
         Difficulty,
 
+        [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingUpdated))]
+        Updated,
+
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingRanked))]
         Ranked,
 
@@ -32,6 +35,9 @@ namespace osu.Game.Overlays.BeatmapListing
         Favourites,
 
         [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingRelevance))]
-        Relevance
+        Relevance,
+
+        [LocalisableDescription(typeof(BeatmapsStrings), nameof(BeatmapsStrings.ListingSearchSortingNominations))]
+        Nominations,
     }
 }

From efebe55d228f9a669bc500a822bf211ca34e6ba3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:58:32 +0300
Subject: [PATCH 327/709] Display certain sort criterias based on selected
 category and query

---
 .../BeatmapListingFilterControl.cs            | 21 ++++----
 .../BeatmapListingSortTabControl.cs           | 53 +++++++++++++++++--
 osu.Game/Overlays/OverlaySortTabControl.cs    |  4 +-
 3 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 2ca369d459..ff9a46ed4f 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -151,19 +151,20 @@ namespace osu.Game.Overlays.BeatmapListing
 
             config.BindWith(OsuSetting.BeatmapListingCardSize, cardSize);
 
-            var sortCriteria = sortControl.Current;
-            var sortDirection = sortControl.SortDirection;
-
-            searchControl.Query.BindValueChanged(query =>
+            searchControl.Query.BindValueChanged(_ =>
             {
-                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? SortCriteria.Ranked : SortCriteria.Relevance;
-                sortDirection.Value = SortDirection.Descending;
+                resetSortControl();
                 queueUpdateSearch(true);
             });
 
+            searchControl.Category.BindValueChanged(_ =>
+            {
+                resetSortControl();
+                queueUpdateSearch();
+            });
+
             searchControl.General.CollectionChanged += (_, _) => queueUpdateSearch();
             searchControl.Ruleset.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Language.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Extra.CollectionChanged += (_, _) => queueUpdateSearch();
@@ -171,8 +172,8 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
             searchControl.ExplicitContent.BindValueChanged(_ => queueUpdateSearch());
 
-            sortCriteria.BindValueChanged(_ => queueUpdateSearch());
-            sortDirection.BindValueChanged(_ => queueUpdateSearch());
+            sortControl.Current.BindValueChanged(_ => queueUpdateSearch());
+            sortControl.SortDirection.BindValueChanged(_ => queueUpdateSearch());
 
             apiUser = api.LocalUser.GetBoundCopy();
             apiUser.BindValueChanged(_ => queueUpdateSearch());
@@ -199,6 +200,8 @@ namespace osu.Game.Overlays.BeatmapListing
             performRequest();
         }
 
+        private void resetSortControl() => sortControl.Reset(searchControl.Category.Value, !string.IsNullOrEmpty(searchControl.Query.Value));
+
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
             SearchStarted?.Invoke();
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 454f381c60..bc1f30dcaf 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -17,18 +17,65 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
 
-        public BeatmapListingSortTabControl()
+        private SearchCategory? lastCategory;
+        private bool? lastHasQuery;
+
+        protected override void LoadComplete()
         {
-            Current.Value = SortCriteria.Ranked;
+            base.LoadComplete();
+            Reset(SearchCategory.Leaderboard, false);
+        }
+
+        public void Reset(SearchCategory category, bool hasQuery)
+        {
+            if (category != lastCategory || hasQuery != lastHasQuery)
+            {
+                TabControl.Clear();
+
+                TabControl.AddItem(SortCriteria.Title);
+                TabControl.AddItem(SortCriteria.Artist);
+                TabControl.AddItem(SortCriteria.Difficulty);
+
+                if (category == SearchCategory.Any || category > SearchCategory.Loved)
+                    TabControl.AddItem(SortCriteria.Updated);
+
+                if (category < SearchCategory.Pending || category == SearchCategory.Mine)
+                    TabControl.AddItem(SortCriteria.Ranked);
+
+                TabControl.AddItem(SortCriteria.Rating);
+                TabControl.AddItem(SortCriteria.Plays);
+                TabControl.AddItem(SortCriteria.Favourites);
+
+                if (hasQuery)
+                    TabControl.AddItem(SortCriteria.Relevance);
+
+                if (category == SearchCategory.Pending)
+                    TabControl.AddItem(SortCriteria.Nominations);
+            }
+
+            var nonQueryCriteria = category >= SearchCategory.Pending ? SortCriteria.Updated : SortCriteria.Ranked;
+
+            Current.Value = hasQuery ? SortCriteria.Relevance : nonQueryCriteria;
+            SortDirection.Value = Overlays.SortDirection.Descending;
+
+            // if the new criteria isn't different from the previous one,
+            // then re-adding tab items will not mark the current tab as selected.
+            // see: https://github.com/ppy/osu-framework/issues/5412
+            TabControl.Current.TriggerChange();
+
+            lastCategory = category;
+            lastHasQuery = hasQuery;
         }
 
         protected override SortTabControl CreateControl() => new BeatmapSortTabControl
         {
-            SortDirection = { BindTarget = SortDirection }
+            SortDirection = { BindTarget = SortDirection },
         };
 
         private class BeatmapSortTabControl : SortTabControl
         {
+            protected override bool AddEnumEntriesAutomatically => false;
+
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
             protected override TabItem<SortCriteria> CreateTabItem(SortCriteria value) => new BeatmapSortTabItem(value)
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index f02d2b388f..befb011353 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays
 {
     public class OverlaySortTabControl<T> : CompositeDrawable, IHasCurrentValue<T>
     {
+        public TabControl<T> TabControl { get; }
+
         private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
 
         public Bindable<T> Current
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays
                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                         Text = SortStrings.Default
                     },
-                    CreateControl().With(c =>
+                    TabControl = CreateControl().With(c =>
                     {
                         c.Anchor = Anchor.CentreLeft;
                         c.Origin = Anchor.CentreLeft;

From 9824d09d490341424a52cfa54cb594036710de82 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Sep 2022 03:58:42 +0300
Subject: [PATCH 328/709] Add test coverage

---
 .../TestSceneBeatmapListingSortTabControl.cs  | 85 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
index 3247461fba..0ef13385ec 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSortTabControl.cs
@@ -3,9 +3,13 @@
 
 #nullable disable
 
+using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -15,12 +19,13 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneBeatmapListingSortTabControl : OsuTestScene
     {
+        private readonly BeatmapListingSortTabControl control;
+
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
         public TestSceneBeatmapListingSortTabControl()
         {
-            BeatmapListingSortTabControl control;
             OsuSpriteText current;
             OsuSpriteText direction;
 
@@ -45,5 +50,83 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
             control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
         }
+
+        [Test]
+        public void TestRankedSort()
+        {
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Any);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Ranked);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Qualified);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Loved);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Favourites);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Pending);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Wip);
+            criteriaShowsOnCategory(false, SortCriteria.Ranked, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(true, SortCriteria.Ranked, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestUpdatedSort()
+        {
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Any);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Ranked);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Qualified);
+            criteriaShowsOnCategory(false, SortCriteria.Updated, SearchCategory.Loved);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Favourites);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Pending);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Wip);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(true, SortCriteria.Updated, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestNominationsSort()
+        {
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Any);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Leaderboard);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Ranked);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Qualified);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Loved);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Favourites);
+            criteriaShowsOnCategory(true, SortCriteria.Nominations, SearchCategory.Pending);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Wip);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Graveyard);
+            criteriaShowsOnCategory(false, SortCriteria.Nominations, SearchCategory.Mine);
+        }
+
+        [Test]
+        public void TestResetNoQuery()
+        {
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Any);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Leaderboard);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Ranked);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Qualified);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Loved);
+            resetUsesCriteriaOnCategory(SortCriteria.Ranked, SearchCategory.Favourites);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Pending);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Wip);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Graveyard);
+            resetUsesCriteriaOnCategory(SortCriteria.Updated, SearchCategory.Mine);
+        }
+
+        private void criteriaShowsOnCategory(bool expected, SortCriteria criteria, SearchCategory category)
+        {
+            AddAssert($"{criteria.ToString().ToLowerInvariant()} {(expected ? "shown" : "not shown")} on {category.ToString().ToLowerInvariant()}", () =>
+            {
+                control.Reset(category, false);
+                return control.ChildrenOfType<TabControl<SortCriteria>>().Single().Items.Contains(criteria) == expected;
+            });
+        }
+
+        private void resetUsesCriteriaOnCategory(SortCriteria criteria, SearchCategory category)
+        {
+            AddAssert($"reset uses {criteria.ToString().ToLowerInvariant()} on {category.ToString().ToLowerInvariant()}", () =>
+            {
+                control.Reset(category, false);
+                return control.Current.Value == criteria;
+            });
+        }
     }
 }

From 31bc067dd1f9a194729580875ef0a82f191988fb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 15:38:44 +0900
Subject: [PATCH 329/709] Don't store nulls to parentMap

---
 .../Objects/Pooling/HitObjectEntryManager.cs  | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 30a8e8f549..66aa2cfaf7 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -36,13 +36,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         /// <summary>
         /// Stores the parent hit object for entries of the nested hit objects.
-        /// A <c>null</c> is stored for entries of the top-level hit objects.
         /// </summary>
         /// <remarks>
         /// The parent hit object of a pooled hit object may be non-pooled.
         /// In that case, no corresponding <see cref="HitObjectLifetimeEntry"/> is stored in this <see cref="HitObjectEntryManager"/>.
         /// </remarks>
-        private readonly Dictionary<HitObjectLifetimeEntry, HitObject?> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject?>();
+        private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
 
         /// <summary>
         /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
@@ -55,16 +54,17 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
             var hitObject = entry.HitObject;
-            parentMap[entry] = parent;
             entryMap[hitObject] = entry;
-
-            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
-                parentChildEntries.Add(entry);
-
-            hitObject.DefaultsApplied += onDefaultsApplied;
-
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
+            if (parent != null)
+            {
+                parentMap[entry] = parent;
+                if (childrenMap.TryGetValue(parent, out var parentChildEntries))
+                    parentChildEntries.Add(entry);
+            }
+
+            hitObject.DefaultsApplied += onDefaultsApplied;
             OnEntryAdded?.Invoke(entry, parent);
         }
 
@@ -74,14 +74,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
             var hitObject = entry.HitObject;
-            parentMap.Remove(entry, out var parent);
             entryMap.Remove(hitObject);
 
-            if (parent != null && childrenMap.TryGetValue(parent, out var parentChildEntries))
+            if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
-            hitObject.DefaultsApplied -= onDefaultsApplied;
-
             // Remove all entries of the nested hit objects
             if (childrenMap.Remove(entry.HitObject, out var childEntries))
             {
@@ -89,6 +86,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
                     Remove(childEntry);
             }
 
+            hitObject.DefaultsApplied -= onDefaultsApplied;
             OnEntryRemoved?.Invoke(entry, parent);
         }
 

From 68e4d2289814dedf98fbe48dfe7116c3a30c9df6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 15:40:03 +0900
Subject: [PATCH 330/709] Precondition against entryMap intead of parentMap

---
 .../Objects/Pooling/HitObjectEntryManager.cs         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 66aa2cfaf7..11caf79d8b 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -50,10 +50,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
         {
-            if (parentMap.ContainsKey(entry))
+            HitObject hitObject = entry.HitObject;
+
+            if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
-            var hitObject = entry.HitObject;
             entryMap[hitObject] = entry;
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
@@ -70,17 +71,18 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public void Remove(HitObjectLifetimeEntry entry)
         {
-            if (!parentMap.ContainsKey(entry))
+            HitObject hitObject = entry.HitObject;
+
+            if (!entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
 
-            var hitObject = entry.HitObject;
             entryMap.Remove(hitObject);
 
             if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
             // Remove all entries of the nested hit objects
-            if (childrenMap.Remove(entry.HitObject, out var childEntries))
+            if (childrenMap.Remove(hitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
                     Remove(childEntry);

From c847cc521e34022b9146aa45b96aa069cd2715a1 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:00:35 +0900
Subject: [PATCH 331/709] Add some inline comments

---
 .../Rulesets/Objects/Pooling/HitObjectEntryManager.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 11caf79d8b..0b30ec09f9 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -55,9 +55,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (entryMap.ContainsKey(hitObject))
                 throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
 
+            // Add the entry.
             entryMap[hitObject] = entry;
             childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
 
+            // If the entry has a parent, set it and add the entry to the parent's children.
             if (parent != null)
             {
                 parentMap[entry] = parent;
@@ -74,14 +76,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
             HitObject hitObject = entry.HitObject;
 
             if (!entryMap.ContainsKey(hitObject))
-                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
+                throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectEntryManager)}.");
 
             entryMap.Remove(hitObject);
 
+            // If the entry has a parent, unset it and remove the entry from the parents' children.
             if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
                 parentChildEntries.Remove(entry);
 
-            // Remove all entries of the nested hit objects
+            // Remove all the entries' children.
             if (childrenMap.Remove(hitObject, out var childEntries))
             {
                 foreach (var childEntry in childEntries)
@@ -105,9 +108,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (!childrenMap.Remove(hitObject, out var childEntries))
                 return;
 
+            // Remove all the entries' children. At this point the parents' (this entries') children list has been removed from the map, so this does not cause upwards traversal.
             foreach (var entry in childEntries)
                 Remove(entry);
 
+            // The removed children list needs to be added back to the map for the entry to potentially receive children.
             childEntries.Clear();
             childrenMap[hitObject] = childEntries;
         }

From e56ea58e71ca78b6f284e37e0c68def4a5889eb5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:06:21 +0900
Subject: [PATCH 332/709] Fix up xmldoc

---
 osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
index 0b30ec09f9..6c39ea44da 100644
--- a/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         private readonly Dictionary<HitObjectLifetimeEntry, HitObject> parentMap = new Dictionary<HitObjectLifetimeEntry, HitObject>();
 
         /// <summary>
-        /// Stores the list of entries managed by this <see cref="HitObjectEntryManager"/> for each hit object managed by this <see cref="HitObjectEntryManager"/>.
+        /// Stores the list of child entries for each hit object managed by this <see cref="HitObjectEntryManager"/>.
         /// </summary>
         private readonly Dictionary<HitObject, List<HitObjectLifetimeEntry>> childrenMap = new Dictionary<HitObject, List<HitObjectLifetimeEntry>>();
 

From 0329601e84c1a26929f0b89c3b86eb1e1ebf350e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 16:09:27 +0900
Subject: [PATCH 333/709] Fix inspection

---
 .../Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
index 79e3cf000e..b6da562bd0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySampleTriggerSource.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hit first hitobject", () =>
             {
                 InputManager.Click(MouseButton.Left);
-                return nextObjectEntry.Result.HasResult;
+                return nextObjectEntry.Result?.HasResult == true;
             });
 
             AddAssert("check correct object after hit", () => sampleTriggerSource.GetMostValidObject() == beatmap.HitObjects[1]);

From 40a60f7145312992a29f0496fc9bb8c08827e1bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:31:00 +0900
Subject: [PATCH 334/709] Remove all entity framework code and migrations

---
 CodeAnalysis/BannedSymbols.txt                |   2 -
 osu.Desktop/osu.Desktop.csproj                |   4 -
 .../Navigation/TestEFToRealmMigration.cs      |  63 --
 .../Beatmaps/BeatmapUpdaterMetadataLookup.cs  |   2 +-
 osu.Game/Database/DatabaseContextFactory.cs   | 218 -------
 osu.Game/Database/DatabaseWriteUsage.cs       |  60 --
 osu.Game/Database/EFToRealmMigrator.cs        | 595 ------------------
 osu.Game/Database/IDatabaseContextFactory.cs  |  23 -
 osu.Game/Database/OsuDbContext.cs             | 214 -------
 .../20171019041408_InitialCreate.Designer.cs  | 293 ---------
 .../20171019041408_InitialCreate.cs           | 314 ---------
 ...025071459_AddMissingIndexRules.Designer.cs | 299 ---------
 .../20171025071459_AddMissingIndexRules.cs    |  83 ---
 ...eatmapOnlineIDUniqueConstraint.Designer.cs | 302 ---------
 ...5731_AddBeatmapOnlineIDUniqueConstraint.cs |  26 -
 ...034410_AddRulesetInfoShortName.Designer.cs | 307 ---------
 .../20171209034410_AddRulesetInfoShortName.cs |  36 --
 .../20180125143340_Settings.Designer.cs       | 329 ----------
 .../Migrations/20180125143340_Settings.cs     |  58 --
 .../20180131154205_AddMuteBinding.cs          |  26 -
 .../20180219060912_AddSkins.Designer.cs       | 379 -----------
 .../Migrations/20180219060912_AddSkins.cs     |  74 ---
 ...54_RemoveUniqueHashConstraints.Designer.cs | 377 -----------
 ...80529055154_RemoveUniqueHashConstraints.cs |  54 --
 ...111_UpdateTaikoDefaultBindings.Designer.cs | 376 -----------
 ...180621044111_UpdateTaikoDefaultBindings.cs |  20 -
 ...628011956_RemoveNegativeSetIDs.Designer.cs | 376 -----------
 .../20180628011956_RemoveNegativeSetIDs.cs    |  21 -
 .../20180913080842_AddRankStatus.Designer.cs  | 380 -----------
 .../20180913080842_AddRankStatus.cs           |  36 --
 ...0181007180454_StandardizePaths.Designer.cs | 380 -----------
 .../20181007180454_StandardizePaths.cs        |  27 -
 ...20181128100659_AddSkinInfoHash.Designer.cs | 387 ------------
 .../20181128100659_AddSkinInfoHash.cs         |  44 --
 ...81130113755_AddScoreInfoTables.Designer.cs | 484 --------------
 .../20181130113755_AddScoreInfoTables.cs      | 115 ----
 ...20190225062029_AddUserIDColumn.Designer.cs | 487 --------------
 .../20190225062029_AddUserIDColumn.cs         |  25 -
 .../20190525060824_SkinSettings.Designer.cs   | 498 ---------------
 .../Migrations/20190525060824_SkinSettings.cs |  57 --
 ...AddDateAddedColumnToBeatmapSet.Designer.cs | 489 --------------
 ...05091246_AddDateAddedColumnToBeatmapSet.cs |  27 -
 ...8070844_AddBPMAndLengthColumns.Designer.cs | 504 ---------------
 .../20190708070844_AddBPMAndLengthColumns.cs  |  36 --
 ...20190913104727_AddBeatmapVideo.Designer.cs | 506 ---------------
 .../20190913104727_AddBeatmapVideo.cs         |  25 -
 ...02094919_RefreshVolumeBindings.Designer.cs | 506 ---------------
 .../20200302094919_RefreshVolumeBindings.cs   |  19 -
 ...01019224408_AddEpilepsyWarning.Designer.cs | 508 ---------------
 .../20201019224408_AddEpilepsyWarning.cs      |  26 -
 ...700_RefreshVolumeBindingsAgain.Designer.cs | 506 ---------------
 ...210412045700_RefreshVolumeBindingsAgain.cs |  19 -
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ---------------
 ...20210511060743_AddSkinInstantiationInfo.cs |  25 -
 ...9_AddAuthorIdToBeatmapMetadata.Designer.cs | 511 ---------------
 ...0514062639_AddAuthorIdToBeatmapMetadata.cs |  26 -
 ...824185035_AddCountdownSettings.Designer.cs | 513 ---------------
 .../20210824185035_AddCountdownSettings.cs    |  26 -
 ...11_AddSamplesMatchPlaybackRate.Designer.cs | 515 ---------------
 ...10912144011_AddSamplesMatchPlaybackRate.cs |  26 -
 .../20211020081609_ResetSkinHashes.cs         |  23 -
 .../Migrations/OsuDbContextModelSnapshot.cs   | 513 ---------------
 osu.Game/OsuGameBase.cs                       |  10 +-
 osu.Game/Screens/Loader.cs                    |  22 +-
 osu.sln.DotSettings                           |   1 -
 65 files changed, 3 insertions(+), 13738 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
 delete mode 100644 osu.Game/Database/DatabaseContextFactory.cs
 delete mode 100644 osu.Game/Database/DatabaseWriteUsage.cs
 delete mode 100644 osu.Game/Database/EFToRealmMigrator.cs
 delete mode 100644 osu.Game/Database/IDatabaseContextFactory.cs
 delete mode 100644 osu.Game/Database/OsuDbContext.cs
 delete mode 100644 osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171019041408_InitialCreate.cs
 delete mode 100644 osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
 delete mode 100644 osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
 delete mode 100644 osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
 delete mode 100644 osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
 delete mode 100644 osu.Game/Migrations/20180125143340_Settings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180125143340_Settings.cs
 delete mode 100644 osu.Game/Migrations/20180131154205_AddMuteBinding.cs
 delete mode 100644 osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180219060912_AddSkins.cs
 delete mode 100644 osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
 delete mode 100644 osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
 delete mode 100644 osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
 delete mode 100644 osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
 delete mode 100644 osu.Game/Migrations/20180913080842_AddRankStatus.cs
 delete mode 100644 osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181007180454_StandardizePaths.cs
 delete mode 100644 osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
 delete mode 100644 osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
 delete mode 100644 osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
 delete mode 100644 osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
 delete mode 100644 osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190525060824_SkinSettings.cs
 delete mode 100644 osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
 delete mode 100644 osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
 delete mode 100644 osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
 delete mode 100644 osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
 delete mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
 delete mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
 delete mode 100644 osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
 delete mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
 delete mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
 delete mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
 delete mode 100644 osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
 delete mode 100644 osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
 delete mode 100644 osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
 delete mode 100644 osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
 delete mode 100644 osu.Game/Migrations/OsuDbContextModelSnapshot.cs

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index e779ee6658..022da0a2ea 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -6,8 +6,6 @@ T:System.IComparable;Don't use non-generic IComparable. Use generic version inst
 T:SixLabors.ImageSharp.IDeepCloneable`1;Use osu.Game.Utils.IDeepCloneable<T> instead.
 M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
-T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
-T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
 T:NuGet.Packaging.CollectionExtensions;Don't use internal extension methods.
 M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
 M:Realms.IRealmCollection`1.SubscribeForNotifications`1(Realms.NotificationCallbackDelegate{``0});Use osu.Game.Database.RealmObjectExtensions.QueryAsyncWithNotifications(IRealmCollection<T>,NotificationCallbackDelegate<T>) instead.
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index c67017f175..8ef480d4e3 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -28,10 +28,6 @@
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.14">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
diff --git a/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs b/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
deleted file mode 100644
index c3559589ed..0000000000
--- a/osu.Game.Tests/Visual/Navigation/TestEFToRealmMigration.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.Linq;
-using System.Runtime.InteropServices;
-using NUnit.Framework;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Models;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osu.Game.Tests.Resources;
-
-namespace osu.Game.Tests.Visual.Navigation
-{
-    public class TestEFToRealmMigration : OsuGameTestScene
-    {
-        public override void RecycleLocalStorage(bool isDisposing)
-        {
-            base.RecycleLocalStorage(isDisposing);
-
-            if (isDisposing)
-                return;
-
-            using (var outStream = LocalStorage.CreateFileSafely(DatabaseContextFactory.DATABASE_NAME))
-            using (var stream = TestResources.OpenResource(DatabaseContextFactory.DATABASE_NAME))
-                stream.CopyTo(outStream);
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                Assert.Ignore("EF-to-realm migrations are not supported on M1 ARM architectures.");
-        }
-
-        public override void SetUpSteps()
-        {
-            // base SetUpSteps are executed before the above SetUp, therefore early-return to allow ignoring test properly.
-            // attempting to ignore here would yield a TargetInvocationException instead.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && RuntimeInformation.OSArchitecture == Architecture.Arm64)
-                return;
-
-            base.SetUpSteps();
-        }
-
-        [Test]
-        public void TestMigration()
-        {
-            // Numbers are taken from the test database (see commit f03de16ee5a46deac3b5f2ca1edfba5c4c5dca7d).
-            AddAssert("Check beatmaps", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<BeatmapSetInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check skins", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<SkinInfo>().Count(s => !s.Protected) == 1));
-            AddAssert("Check scores", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<ScoreInfo>().Count() == 1));
-
-            // One extra file is created during realm migration / startup due to the circles intro import.
-            AddAssert("Check files", () => Game.Dependencies.Get<RealmAccess>().Run(r => r.All<RealmFile>().Count() == 271));
-        }
-    }
-}
diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index f96fcc2630..aa773da6d3 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Beatmaps
 
             try
             {
-                using (var db = new SqliteConnection(DatabaseContextFactory.CreateDatabaseConnectionString("online.db", storage)))
+                using (var db = new SqliteConnection(string.Concat("Data Source=", storage.GetFullPath($@"{"online.db"}", true))))
                 {
                     db.Open();
 
diff --git a/osu.Game/Database/DatabaseContextFactory.cs b/osu.Game/Database/DatabaseContextFactory.cs
deleted file mode 100644
index af91fb4971..0000000000
--- a/osu.Game/Database/DatabaseContextFactory.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Framework.Statistics;
-
-namespace osu.Game.Database
-{
-    public class DatabaseContextFactory : IDatabaseContextFactory
-    {
-        private readonly Storage storage;
-
-        public const string DATABASE_NAME = @"client.db";
-
-        private ThreadLocal<OsuDbContext> threadContexts;
-
-        private readonly object writeLock = new object();
-
-        private bool currentWriteDidWrite;
-        private bool currentWriteDidError;
-
-        private int currentWriteUsages;
-
-        private IDbContextTransaction currentWriteTransaction;
-
-        public DatabaseContextFactory(Storage storage)
-        {
-            this.storage = storage;
-            recycleThreadContexts();
-        }
-
-        private static readonly GlobalStatistic<int> reads = GlobalStatistics.Get<int>("Database", "Get (Read)");
-        private static readonly GlobalStatistic<int> writes = GlobalStatistics.Get<int>("Database", "Get (Write)");
-        private static readonly GlobalStatistic<int> commits = GlobalStatistics.Get<int>("Database", "Commits");
-        private static readonly GlobalStatistic<int> rollbacks = GlobalStatistics.Get<int>("Database", "Rollbacks");
-
-        /// <summary>
-        /// Get a context for the current thread for read-only usage.
-        /// If a <see cref="DatabaseWriteUsage"/> is in progress, the existing write-safe context will be returned.
-        /// </summary>
-        public OsuDbContext Get()
-        {
-            reads.Value++;
-            return threadContexts.Value;
-        }
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        public DatabaseWriteUsage GetForWrite(bool withTransaction = true)
-        {
-            writes.Value++;
-            Monitor.Enter(writeLock);
-            OsuDbContext context;
-
-            try
-            {
-                if (currentWriteTransaction == null && withTransaction)
-                {
-                    // this mitigates the fact that changes on tracked entities will not be rolled back with the transaction by ensuring write operations are always executed in isolated contexts.
-                    // if this results in sub-optimal efficiency, we may need to look into removing Database-level transactions in favour of running SaveChanges where we currently commit the transaction.
-                    if (threadContexts.IsValueCreated)
-                        recycleThreadContexts();
-
-                    context = threadContexts.Value;
-                    currentWriteTransaction = context.Database.BeginTransaction();
-                }
-                else
-                {
-                    // we want to try-catch the retrieval of the context because it could throw an error (in CreateContext).
-                    context = threadContexts.Value;
-                }
-            }
-            catch
-            {
-                // retrieval of a context could trigger a fatal error.
-                Monitor.Exit(writeLock);
-                throw;
-            }
-
-            Interlocked.Increment(ref currentWriteUsages);
-
-            return new DatabaseWriteUsage(context, usageCompleted) { IsTransactionLeader = currentWriteTransaction != null && currentWriteUsages == 1 };
-        }
-
-        private void usageCompleted(DatabaseWriteUsage usage)
-        {
-            int usages = Interlocked.Decrement(ref currentWriteUsages);
-
-            try
-            {
-                currentWriteDidWrite |= usage.PerformedWrite;
-                currentWriteDidError |= usage.Errors.Any();
-
-                if (usages == 0)
-                {
-                    if (currentWriteDidError)
-                    {
-                        rollbacks.Value++;
-                        currentWriteTransaction?.Rollback();
-                    }
-                    else
-                    {
-                        commits.Value++;
-                        currentWriteTransaction?.Commit();
-                    }
-
-                    if (currentWriteDidWrite || currentWriteDidError)
-                    {
-                        // explicitly dispose to ensure any outstanding flushes happen as soon as possible (and underlying resources are purged).
-                        usage.Context.Dispose();
-
-                        // once all writes are complete, we want to refresh thread-specific contexts to make sure they don't have stale local caches.
-                        recycleThreadContexts();
-                    }
-
-                    currentWriteTransaction = null;
-                    currentWriteDidWrite = false;
-                    currentWriteDidError = false;
-                }
-            }
-            finally
-            {
-                Monitor.Exit(writeLock);
-            }
-        }
-
-        private void recycleThreadContexts()
-        {
-            // Contexts for other threads are not disposed as they may be in use elsewhere. Instead, fresh contexts are exposed
-            // for other threads to use, and we rely on the finalizer inside OsuDbContext to handle their previous contexts
-            threadContexts?.Value.Dispose();
-            threadContexts = new ThreadLocal<OsuDbContext>(CreateContext, true);
-        }
-
-        protected virtual OsuDbContext CreateContext() => new OsuDbContext(CreateDatabaseConnectionString(DATABASE_NAME, storage))
-        {
-            Database = { AutoTransactionsEnabled = false }
-        };
-
-        public void CreateBackup(string backupFilename)
-        {
-            Logger.Log($"Creating full EF database backup at {backupFilename}", LoggingTarget.Database);
-
-            using (var source = storage.GetStream(DATABASE_NAME, mode: FileMode.Open))
-            using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
-                source.CopyTo(destination);
-        }
-
-        public void ResetDatabase()
-        {
-            lock (writeLock)
-            {
-                recycleThreadContexts();
-
-                try
-                {
-                    int attempts = 10;
-
-                    // Retry logic taken from MigratableStorage.AttemptOperation.
-                    while (true)
-                    {
-                        try
-                        {
-                            storage.Delete(DATABASE_NAME);
-                            return;
-                        }
-                        catch (Exception)
-                        {
-                            if (attempts-- == 0)
-                                throw;
-                        }
-
-                        Thread.Sleep(250);
-                    }
-                }
-                catch
-                {
-                    // for now we are not sure why file handles are kept open by EF, but this is generally only used in testing
-                }
-            }
-        }
-
-        public void FlushConnections()
-        {
-            if (threadContexts != null)
-            {
-                foreach (var context in threadContexts.Values)
-                    context.Dispose();
-            }
-
-            recycleThreadContexts();
-        }
-
-        public static string CreateDatabaseConnectionString(string filename, Storage storage) => string.Concat("Data Source=", storage.GetFullPath($@"{filename}", true));
-
-        private readonly ManualResetEventSlim migrationComplete = new ManualResetEventSlim();
-
-        public void SetMigrationCompletion() => migrationComplete.Set();
-
-        public void WaitForMigrationCompletion()
-        {
-            if (!migrationComplete.Wait(300000))
-                throw new TimeoutException("Migration took too long (likely stuck).");
-        }
-    }
-}
diff --git a/osu.Game/Database/DatabaseWriteUsage.cs b/osu.Game/Database/DatabaseWriteUsage.cs
deleted file mode 100644
index b5f25eae20..0000000000
--- a/osu.Game/Database/DatabaseWriteUsage.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace osu.Game.Database
-{
-    public class DatabaseWriteUsage : IDisposable
-    {
-        public readonly OsuDbContext Context;
-        private readonly Action<DatabaseWriteUsage> usageCompleted;
-
-        public DatabaseWriteUsage(OsuDbContext context, Action<DatabaseWriteUsage> onCompleted)
-        {
-            Context = context;
-            usageCompleted = onCompleted;
-        }
-
-        public bool PerformedWrite { get; private set; }
-
-        private bool isDisposed;
-        public List<Exception> Errors = new List<Exception>();
-
-        /// <summary>
-        /// Whether this write usage will commit a transaction on completion.
-        /// If false, there is a parent usage responsible for transaction commit.
-        /// </summary>
-        public bool IsTransactionLeader;
-
-        protected void Dispose(bool disposing)
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            try
-            {
-                PerformedWrite |= Context.SaveChanges() > 0;
-            }
-            catch (Exception e)
-            {
-                Errors.Add(e);
-                throw;
-            }
-            finally
-            {
-                usageCompleted?.Invoke(this);
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
diff --git a/osu.Game/Database/EFToRealmMigrator.cs b/osu.Game/Database/EFToRealmMigrator.cs
deleted file mode 100644
index 294a8cd3ed..0000000000
--- a/osu.Game/Database/EFToRealmMigrator.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-// 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.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using osu.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Development;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Framework.Platform;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Models;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using osuTK;
-using Realms;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
-using SharpCompress.Writers.Zip;
-
-namespace osu.Game.Database
-{
-    internal class EFToRealmMigrator : CompositeDrawable
-    {
-        public Task<bool> MigrationCompleted => migrationCompleted.Task;
-
-        private readonly TaskCompletionSource<bool> migrationCompleted = new TaskCompletionSource<bool>();
-
-        [Resolved]
-        private DatabaseContextFactory efContextFactory { get; set; } = null!;
-
-        [Resolved]
-        private RealmAccess realm { get; set; } = null!;
-
-        [Resolved]
-        private OsuConfigManager config { get; set; } = null!;
-
-        [Resolved]
-        private INotificationOverlay notificationOverlay { get; set; } = null!;
-
-        [Resolved]
-        private OsuGame game { get; set; } = null!;
-
-        [Resolved]
-        private Storage storage { get; set; } = null!;
-
-        private readonly OsuTextFlowContainer currentOperationText;
-
-        public EFToRealmMigrator()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Spacing = new Vector2(10),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Database migration in progress",
-                            Font = OsuFont.Default.With(size: 40)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "This could take a few minutes depending on the speed of your disk(s).",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = "Please keep the window open until this completes!",
-                            Font = OsuFont.Default.With(size: 30)
-                        },
-                        new LoadingSpinner(true)
-                        {
-                            State = { Value = Visibility.Visible }
-                        },
-                        currentOperationText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: 30))
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                            TextAnchor = Anchor.TopCentre,
-                        },
-                    }
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            beginMigration();
-        }
-
-        private void beginMigration()
-        {
-            const string backup_folder = "backups";
-
-            string backupSuffix = $"before_final_migration_{DateTimeOffset.UtcNow.ToUnixTimeSeconds()}";
-
-            // required for initial backup.
-            var realmBlockOperations = realm.BlockAllOperations("EF migration");
-
-            Task.Factory.StartNew(() =>
-            {
-                try
-                {
-                    realm.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.realm"));
-                }
-                finally
-                {
-                    // Once the backup is created, we need to stop blocking operations so the migration can complete.
-                    realmBlockOperations.Dispose();
-                    // Clean up here so we don't accidentally dispose twice.
-                    realmBlockOperations = null;
-                }
-
-                efContextFactory.CreateBackup(Path.Combine(backup_folder, $"client.{backupSuffix}.db"));
-
-                using (var ef = efContextFactory.Get())
-                {
-                    realm.Write(r =>
-                    {
-                        // Before beginning, ensure realm is in an empty state.
-                        // Migrations which are half-completed could lead to issues if the user tries a second time.
-                        // Note that we only do this for beatmaps and scores since the other migrations are yonks old.
-                        r.RemoveAll<BeatmapSetInfo>();
-                        r.RemoveAll<BeatmapInfo>();
-                        r.RemoveAll<BeatmapMetadata>();
-                        r.RemoveAll<ScoreInfo>();
-                    });
-
-                    ef.Migrate();
-
-                    migrateSettings(ef);
-                    migrateSkins(ef);
-                    migrateBeatmaps(ef);
-                    migrateScores(ef);
-                }
-            }, TaskCreationOptions.LongRunning).ContinueWith(t =>
-            {
-                if (t.Exception == null)
-                {
-                    log("Migration successful!");
-
-                    if (DebugUtils.IsDebugBuild)
-                    {
-                        Logger.Log(
-                            "Your development database has been fully migrated to realm. If you switch back to a pre-realm branch and need your previous database, rename the backup file back to \"client.db\".\n\nNote that doing this can potentially leave your file store in a bad state.",
-                            level: LogLevel.Important);
-                    }
-                }
-                else
-                {
-                    log("Migration failed!");
-                    Logger.Log(t.Exception.ToString(), LoggingTarget.Database);
-
-                    if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && t.Exception.Flatten().InnerException is TypeInitializationException)
-                    {
-                        // Not guaranteed to be the only cause of exception, but let's roll with it for now.
-                        log("Please download and run the intel version of osu! once\nto allow data migration to complete!");
-                        efContextFactory.SetMigrationCompletion();
-                        return;
-                    }
-
-                    notificationOverlay.Post(new SimpleErrorNotification
-                    {
-                        Text =
-                            "IMPORTANT: During data migration, some of your data could not be successfully migrated. The previous version has been backed up.\n\nFor further assistance, please open a discussion on github and attach your backup files (click to get started).",
-                        Activated = () =>
-                        {
-                            game.OpenUrlExternally(
-                                $@"https://github.com/ppy/osu/discussions/new?title=Realm%20migration%20issue ({t.Exception.Message})&body=Please%20drag%20the%20""attach_me.zip""%20file%20here!&category=q-a",
-                                true);
-
-                            const string attachment_filename = "attach_me.zip";
-
-                            var backupStorage = storage.GetStorageForDirectory(backup_folder);
-
-                            backupStorage.Delete(attachment_filename);
-
-                            try
-                            {
-                                using (var zip = ZipArchive.Create())
-                                {
-                                    zip.AddAllFromDirectory(backupStorage.GetFullPath(string.Empty));
-                                    zip.SaveTo(Path.Combine(backupStorage.GetFullPath(string.Empty), attachment_filename), new ZipWriterOptions(CompressionType.Deflate));
-                                }
-                            }
-                            catch { }
-
-                            backupStorage.PresentFileExternally(attachment_filename);
-
-                            return true;
-                        }
-                    });
-                }
-
-                // Regardless of success, since the game is going to continue with startup let's move the ef database out of the way.
-                // If we were to not do this, the migration would run another time the next time the user starts the game.
-                deletePreRealmData();
-
-                // If something went wrong and the disposal token wasn't invoked above, ensure it is here.
-                realmBlockOperations?.Dispose();
-
-                migrationCompleted.SetResult(true);
-                efContextFactory.SetMigrationCompletion();
-            });
-        }
-
-        private void deletePreRealmData()
-        {
-            // Delete the database permanently.
-            // Will cause future startups to not attempt migration.
-            efContextFactory.ResetDatabase();
-        }
-
-        private void log(string message)
-        {
-            Logger.Log(message, LoggingTarget.Database);
-            Scheduler.AddOnce(m => currentOperationText.Text = m, message);
-        }
-
-        private void migrateBeatmaps(OsuDbContext ef)
-        {
-            // can be removed 20220730.
-            var existingBeatmapSets = ef.EFBeatmapSetInfo
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.RulesetInfo)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
-                                        .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                                        .Include(s => s.Files).ThenInclude(f => f.FileInfo)
-                                        .Include(s => s.Metadata)
-                                        .AsSplitQuery();
-
-            log("Beginning beatmaps migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingBeatmapSets.Any())
-            {
-                log("No beatmaps found to migrate");
-                return;
-            }
-
-            int count = existingBeatmapSets.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} beatmaps in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var beatmapSet in existingBeatmapSets)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} beatmaps...");
-                        }
-
-                        var realmBeatmapSet = new BeatmapSetInfo
-                        {
-                            OnlineID = beatmapSet.OnlineID ?? -1,
-                            DateAdded = beatmapSet.DateAdded,
-                            Status = beatmapSet.Status,
-                            DeletePending = beatmapSet.DeletePending,
-                            Hash = beatmapSet.Hash,
-                            Protected = beatmapSet.Protected,
-                        };
-
-                        migrateFiles(beatmapSet, r, realmBeatmapSet);
-
-                        foreach (var beatmap in beatmapSet.Beatmaps)
-                        {
-                            var ruleset = r.Find<RulesetInfo>(beatmap.RulesetInfo.ShortName);
-                            var metadata = getBestMetadata(beatmap.Metadata, beatmapSet.Metadata);
-
-                            if (ruleset == null)
-                            {
-                                log($"Skipping {++missing} beatmaps with missing ruleset");
-                                continue;
-                            }
-
-                            var realmBeatmap = new BeatmapInfo(ruleset, new BeatmapDifficulty(beatmap.BaseDifficulty), metadata)
-                            {
-                                DifficultyName = beatmap.DifficultyName,
-                                Status = beatmap.Status,
-                                OnlineID = beatmap.OnlineID ?? -1,
-                                Length = beatmap.Length,
-                                BPM = beatmap.BPM,
-                                Hash = beatmap.Hash,
-                                StarRating = beatmap.StarRating,
-                                MD5Hash = beatmap.MD5Hash,
-                                Hidden = beatmap.Hidden,
-                                AudioLeadIn = beatmap.AudioLeadIn,
-                                StackLeniency = beatmap.StackLeniency,
-                                SpecialStyle = beatmap.SpecialStyle,
-                                LetterboxInBreaks = beatmap.LetterboxInBreaks,
-                                WidescreenStoryboard = beatmap.WidescreenStoryboard,
-                                EpilepsyWarning = beatmap.EpilepsyWarning,
-                                SamplesMatchPlaybackRate = beatmap.SamplesMatchPlaybackRate,
-                                DistanceSpacing = beatmap.DistanceSpacing,
-                                BeatDivisor = beatmap.BeatDivisor,
-                                GridSize = beatmap.GridSize,
-                                TimelineZoom = beatmap.TimelineZoom,
-                                Countdown = beatmap.Countdown,
-                                CountdownOffset = beatmap.CountdownOffset,
-                                Bookmarks = beatmap.Bookmarks,
-                                BeatmapSet = realmBeatmapSet,
-                            };
-
-                            realmBeatmapSet.Beatmaps.Add(realmBeatmap);
-                        }
-
-                        r.Add(realmBeatmapSet);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} beatmaps to realm");
-            });
-        }
-
-        private BeatmapMetadata getBestMetadata(EFBeatmapMetadata? beatmapMetadata, EFBeatmapMetadata? beatmapSetMetadata)
-        {
-            var metadata = beatmapMetadata ?? beatmapSetMetadata ?? new EFBeatmapMetadata();
-
-            return new BeatmapMetadata
-            {
-                Title = metadata.Title,
-                TitleUnicode = metadata.TitleUnicode,
-                Artist = metadata.Artist,
-                ArtistUnicode = metadata.ArtistUnicode,
-                Author =
-                {
-                    OnlineID = metadata.Author.Id,
-                    Username = metadata.Author.Username,
-                },
-                Source = metadata.Source,
-                Tags = metadata.Tags,
-                PreviewTime = metadata.PreviewTime,
-                AudioFile = metadata.AudioFile,
-                BackgroundFile = metadata.BackgroundFile,
-            };
-        }
-
-        private void migrateScores(OsuDbContext db)
-        {
-            // can be removed 20220730.
-            var existingScores = db.ScoreInfo
-                                   .Include(s => s.Ruleset)
-                                   .Include(s => s.BeatmapInfo)
-                                   .Include(s => s.Files)
-                                   .ThenInclude(f => f.FileInfo)
-                                   .AsSplitQuery();
-
-            log("Beginning scores migration to realm");
-
-            // previous entries in EF are removed post migration.
-            if (!existingScores.Any())
-            {
-                log("No scores found to migrate");
-                return;
-            }
-
-            int count = existingScores.Count();
-
-            realm.Run(r =>
-            {
-                log($"Found {count} scores in EF");
-
-                var transaction = r.BeginWrite();
-                int written = 0;
-                int missing = 0;
-
-                try
-                {
-                    foreach (var score in existingScores)
-                    {
-                        if (++written % 1000 == 0)
-                        {
-                            transaction.Commit();
-                            transaction = r.BeginWrite();
-                            log($"Migrated {written}/{count} scores...");
-                        }
-
-                        var beatmap = r.All<BeatmapInfo>().FirstOrDefault(b => b.Hash == score.BeatmapInfo.Hash);
-                        var ruleset = r.Find<RulesetInfo>(score.Ruleset.ShortName);
-
-                        if (beatmap == null || ruleset == null)
-                        {
-                            log($"Skipping {++missing} scores with missing ruleset or beatmap");
-                            continue;
-                        }
-
-                        var user = new RealmUser
-                        {
-                            OnlineID = score.User.OnlineID,
-                            Username = score.User.Username
-                        };
-
-                        var realmScore = new ScoreInfo(beatmap, ruleset, user)
-                        {
-                            Hash = score.Hash,
-                            DeletePending = score.DeletePending,
-                            OnlineID = score.OnlineID ?? -1,
-                            ModsJson = score.ModsJson,
-                            StatisticsJson = score.StatisticsJson,
-                            TotalScore = score.TotalScore,
-                            MaxCombo = score.MaxCombo,
-                            Accuracy = score.Accuracy,
-                            Date = score.Date,
-                            PP = score.PP,
-                            Rank = score.Rank,
-                            HitEvents = score.HitEvents,
-                            Passed = score.Passed,
-                            Combo = score.Combo,
-                            Position = score.Position,
-                            Statistics = score.Statistics,
-                            Mods = score.Mods,
-                            APIMods = score.APIMods,
-                        };
-
-                        migrateFiles(score, r, realmScore);
-
-                        r.Add(realmScore);
-                    }
-                }
-                finally
-                {
-                    transaction.Commit();
-                }
-
-                log($"Successfully migrated {count} scores to realm");
-            });
-        }
-
-        private void migrateSkins(OsuDbContext db)
-        {
-            // can be removed 20220530.
-            var existingSkins = db.SkinInfo
-                                  .Include(s => s.Files)
-                                  .ThenInclude(f => f.FileInfo)
-                                  .AsSplitQuery()
-                                  .ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSkins.Any())
-                return;
-
-            var userSkinChoice = config.GetBindable<string>(OsuSetting.Skin);
-            int.TryParse(userSkinChoice.Value, out int userSkinInt);
-
-            switch (userSkinInt)
-            {
-                case EFSkinInfo.DEFAULT_SKIN:
-                    userSkinChoice.Value = SkinInfo.DEFAULT_SKIN.ToString();
-                    break;
-
-                case EFSkinInfo.CLASSIC_SKIN:
-                    userSkinChoice.Value = SkinInfo.CLASSIC_SKIN.ToString();
-                    break;
-            }
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    // note that this cannot be written as: `r.All<SkinInfo>().All(s => s.Protected)`, because realm does not support `.All()`.
-                    if (!r.All<SkinInfo>().Any(s => !s.Protected))
-                    {
-                        log($"Migrating {existingSkins.Count} skins");
-
-                        foreach (var skin in existingSkins)
-                        {
-                            var realmSkin = new SkinInfo
-                            {
-                                Name = skin.Name,
-                                Creator = skin.Creator,
-                                Hash = skin.Hash,
-                                Protected = false,
-                                InstantiationInfo = skin.InstantiationInfo,
-                            };
-
-                            migrateFiles(skin, r, realmSkin);
-
-                            r.Add(realmSkin);
-
-                            if (skin.ID == userSkinInt)
-                                userSkinChoice.Value = realmSkin.ID.ToString();
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private static void migrateFiles<T>(IHasFiles<T> fileSource, Realm realm, IHasRealmFiles realmObject) where T : INamedFileInfo
-        {
-            foreach (var file in fileSource.Files)
-            {
-                var realmFile = realm.Find<RealmFile>(file.FileInfo.Hash);
-
-                if (realmFile == null)
-                    realm.Add(realmFile = new RealmFile { Hash = file.FileInfo.Hash });
-
-                realmObject.Files.Add(new RealmNamedFileUsage(realmFile, file.Filename));
-            }
-        }
-
-        private void migrateSettings(OsuDbContext db)
-        {
-            // migrate ruleset settings. can be removed 20220315.
-            var existingSettings = db.DatabasedSetting.ToList();
-
-            // previous entries in EF are removed post migration.
-            if (!existingSettings.Any())
-                return;
-
-            log("Beginning settings migration to realm");
-
-            realm.Run(r =>
-            {
-                using (var transaction = r.BeginWrite())
-                {
-                    // only migrate data if the realm database is empty.
-                    if (!r.All<RealmRulesetSetting>().Any())
-                    {
-                        log($"Migrating {existingSettings.Count} settings");
-
-                        foreach (var dkb in existingSettings)
-                        {
-                            if (dkb.RulesetID == null)
-                                continue;
-
-                            string? shortName = getRulesetShortNameFromLegacyID(dkb.RulesetID.Value);
-
-                            if (string.IsNullOrEmpty(shortName))
-                                continue;
-
-                            r.Add(new RealmRulesetSetting
-                            {
-                                Key = dkb.Key,
-                                Value = dkb.StringValue,
-                                RulesetName = shortName,
-                                Variant = dkb.Variant ?? 0,
-                            });
-                        }
-                    }
-
-                    transaction.Commit();
-                }
-            });
-        }
-
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
-    }
-}
diff --git a/osu.Game/Database/IDatabaseContextFactory.cs b/osu.Game/Database/IDatabaseContextFactory.cs
deleted file mode 100644
index bddabad586..0000000000
--- a/osu.Game/Database/IDatabaseContextFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.
-
-#nullable disable
-
-namespace osu.Game.Database
-{
-    public interface IDatabaseContextFactory
-    {
-        /// <summary>
-        /// Get a context for read-only usage.
-        /// </summary>
-        OsuDbContext Get();
-
-        /// <summary>
-        /// Request a context for write usage. Can be consumed in a nested fashion (and will return the same underlying context).
-        /// This method may block if a write is already active on a different thread.
-        /// </summary>
-        /// <param name="withTransaction">Whether to start a transaction for this write.</param>
-        /// <returns>A usage containing a usable context.</returns>
-        DatabaseWriteUsage GetForWrite(bool withTransaction = true);
-    }
-}
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
deleted file mode 100644
index 118a8ee469..0000000000
--- a/osu.Game/Database/OsuDbContext.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using osu.Framework.Logging;
-using osu.Framework.Statistics;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.IO;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-using SQLitePCL;
-using LogLevel = Microsoft.Extensions.Logging.LogLevel;
-
-namespace osu.Game.Database
-{
-    public class OsuDbContext : DbContext
-    {
-        public DbSet<EFBeatmapInfo> EFBeatmapInfo { get; set; }
-        public DbSet<EFBeatmapDifficulty> BeatmapDifficulty { get; set; }
-        public DbSet<EFBeatmapMetadata> BeatmapMetadata { get; set; }
-        public DbSet<EFBeatmapSetInfo> EFBeatmapSetInfo { get; set; }
-        public DbSet<FileInfo> FileInfo { get; set; }
-        public DbSet<EFRulesetInfo> RulesetInfo { get; set; }
-        public DbSet<EFSkinInfo> SkinInfo { get; set; }
-        public DbSet<EFScoreInfo> ScoreInfo { get; set; }
-
-        // migrated to realm
-        public DbSet<DatabasedSetting> DatabasedSetting { get; set; }
-
-        private readonly string connectionString;
-
-        private static readonly Lazy<OsuDbLoggerFactory> logger = new Lazy<OsuDbLoggerFactory>(() => new OsuDbLoggerFactory());
-
-        private static readonly GlobalStatistic<int> contexts = GlobalStatistics.Get<int>("Database", "Contexts");
-
-        static OsuDbContext()
-        {
-            // required to initialise native SQLite libraries on some platforms.
-            Batteries_V2.Init();
-
-            // https://github.com/aspnet/EntityFrameworkCore/issues/9994#issuecomment-508588678
-            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
-        }
-
-        /// <summary>
-        /// Create a new in-memory OsuDbContext instance.
-        /// </summary>
-        public OsuDbContext()
-            : this("DataSource=:memory:")
-        {
-            // required for tooling (see https://wildermuth.com/2017/07/06/Program-cs-in-ASP-NET-Core-2-0).
-
-            Migrate();
-        }
-
-        /// <summary>
-        /// Create a new OsuDbContext instance.
-        /// </summary>
-        /// <param name="connectionString">A valid SQLite connection string.</param>
-        public OsuDbContext(string connectionString)
-        {
-            this.connectionString = connectionString;
-
-            var connection = Database.GetDbConnection();
-
-            try
-            {
-                connection.Open();
-
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "PRAGMA journal_mode=WAL;";
-                    cmd.ExecuteNonQuery();
-
-                    cmd.CommandText = "PRAGMA foreign_keys=OFF;";
-                    cmd.ExecuteNonQuery();
-                }
-            }
-            catch
-            {
-                connection.Close();
-                throw;
-            }
-
-            contexts.Value++;
-        }
-
-        ~OsuDbContext()
-        {
-            // DbContext does not contain a finalizer (https://github.com/aspnet/EntityFrameworkCore/issues/8872)
-            // This is used to clean up previous contexts when fresh contexts are exposed via DatabaseContextFactory
-            Dispose();
-        }
-
-        private bool isDisposed;
-
-        public override void Dispose()
-        {
-            if (isDisposed) return;
-
-            isDisposed = true;
-
-            base.Dispose();
-
-            contexts.Value--;
-            GC.SuppressFinalize(this);
-        }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            base.OnConfiguring(optionsBuilder);
-            optionsBuilder
-                // this is required for the time being due to the way we are querying in places like BeatmapStore.
-                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
-                .UseLoggerFactory(logger.Value);
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.MD5Hash);
-            modelBuilder.Entity<EFBeatmapInfo>().HasIndex(b => b.Hash);
-
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.OnlineID).IsUnique();
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFBeatmapSetInfo>().HasIndex(b => b.Hash).IsUnique();
-
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<EFSkinInfo>().HasIndex(b => b.DeletePending);
-            modelBuilder.Entity<EFSkinInfo>().HasMany(s => s.Files).WithOne(f => f.SkinInfo);
-
-            modelBuilder.Entity<DatabasedSetting>().HasIndex(b => new { b.RulesetID, b.Variant });
-
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.Hash).IsUnique();
-            modelBuilder.Entity<FileInfo>().HasIndex(b => b.ReferenceCount);
-
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.Available);
-            modelBuilder.Entity<EFRulesetInfo>().HasIndex(b => b.ShortName).IsUnique();
-
-            modelBuilder.Entity<EFBeatmapInfo>().HasOne(b => b.BaseDifficulty);
-
-            modelBuilder.Entity<EFScoreInfo>().HasIndex(b => b.OnlineID).IsUnique();
-        }
-
-        private class OsuDbLoggerFactory : ILoggerFactory
-        {
-            #region Disposal
-
-            public void Dispose()
-            {
-            }
-
-            #endregion
-
-            public ILogger CreateLogger(string categoryName) => new OsuDbLogger();
-
-            public void AddProvider(ILoggerProvider provider)
-            {
-                // no-op. called by tooling.
-            }
-
-            private class OsuDbLogger : ILogger
-            {
-                public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-                {
-                    if (logLevel < LogLevel.Information)
-                        return;
-
-                    Framework.Logging.LogLevel frameworkLogLevel;
-
-                    switch (logLevel)
-                    {
-                        default:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Debug;
-                            break;
-
-                        case LogLevel.Warning:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Important;
-                            break;
-
-                        case LogLevel.Error:
-                        case LogLevel.Critical:
-                            frameworkLogLevel = Framework.Logging.LogLevel.Error;
-                            break;
-                    }
-
-                    Logger.Log(formatter(state, exception), LoggingTarget.Database, frameworkLogLevel);
-                }
-
-                public bool IsEnabled(LogLevel logLevel)
-                {
-#if DEBUG_DATABASE
-                    return logLevel > LogLevel.Debug;
-#else
-                    return logLevel > LogLevel.Information;
-#endif
-                }
-
-                public IDisposable BeginScope<TState>(TState state) => null;
-            }
-        }
-
-        public void Migrate() => Database.Migrate();
-    }
-}
diff --git a/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs b/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
deleted file mode 100644
index c751530bf4..0000000000
--- a/osu.Game/Migrations/20171019041408_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171019041408_InitialCreate")]
-    partial class InitialCreate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171019041408_InitialCreate.cs b/osu.Game/Migrations/20171019041408_InitialCreate.cs
deleted file mode 100644
index 08ab64fd08..0000000000
--- a/osu.Game/Migrations/20171019041408_InitialCreate.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class InitialCreate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "BeatmapDifficulty",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    ApproachRate = table.Column<float>(type: "REAL", nullable: false),
-                    CircleSize = table.Column<float>(type: "REAL", nullable: false),
-                    DrainRate = table.Column<float>(type: "REAL", nullable: false),
-                    OverallDifficulty = table.Column<float>(type: "REAL", nullable: false),
-                    SliderMultiplier = table.Column<float>(type: "REAL", nullable: false),
-                    SliderTickRate = table.Column<float>(type: "REAL", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapDifficulty", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapMetadata",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Artist = table.Column<string>(type: "TEXT", nullable: true),
-                    ArtistUnicode = table.Column<string>(type: "TEXT", nullable: true),
-                    AudioFile = table.Column<string>(type: "TEXT", nullable: true),
-                    Author = table.Column<string>(type: "TEXT", nullable: true),
-                    BackgroundFile = table.Column<string>(type: "TEXT", nullable: true),
-                    PreviewTime = table.Column<int>(type: "INTEGER", nullable: false),
-                    Source = table.Column<string>(type: "TEXT", nullable: true),
-                    Tags = table.Column<string>(type: "TEXT", nullable: true),
-                    Title = table.Column<string>(type: "TEXT", nullable: true),
-                    TitleUnicode = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapMetadata", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "FileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    ReferenceCount = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_FileInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "KeyBinding",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Action = table.Column<int>(type: "INTEGER", nullable: false),
-                    Keys = table.Column<string>(type: "TEXT", nullable: true),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Variant = table.Column<int>(type: "INTEGER", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_KeyBinding", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "RulesetInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Available = table.Column<bool>(type: "INTEGER", nullable: false),
-                    InstantiationInfo = table.Column<string>(type: "TEXT", nullable: true),
-                    Name = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RulesetInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapSetInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    DeletePending = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    MetadataID = table.Column<int>(type: "INTEGER", nullable: true),
-                    OnlineBeatmapSetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Protected = table.Column<bool>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapSetInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetInfo_BeatmapMetadata_MetadataID",
-                        column: x => x.MetadataID,
-                        principalTable: "BeatmapMetadata",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    AudioLeadIn = table.Column<int>(type: "INTEGER", nullable: false),
-                    BaseDifficultyID = table.Column<int>(type: "INTEGER", nullable: false),
-                    BeatDivisor = table.Column<int>(type: "INTEGER", nullable: false),
-                    BeatmapSetInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Countdown = table.Column<bool>(type: "INTEGER", nullable: false),
-                    DistanceSpacing = table.Column<double>(type: "REAL", nullable: false),
-                    GridSize = table.Column<int>(type: "INTEGER", nullable: false),
-                    Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    Hidden = table.Column<bool>(type: "INTEGER", nullable: false),
-                    LetterboxInBreaks = table.Column<bool>(type: "INTEGER", nullable: false),
-                    MD5Hash = table.Column<string>(type: "TEXT", nullable: true),
-                    MetadataID = table.Column<int>(type: "INTEGER", nullable: true),
-                    OnlineBeatmapID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Path = table.Column<string>(type: "TEXT", nullable: true),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: false),
-                    SpecialStyle = table.Column<bool>(type: "INTEGER", nullable: false),
-                    StackLeniency = table.Column<float>(type: "REAL", nullable: false),
-                    StarDifficulty = table.Column<double>(type: "REAL", nullable: false),
-                    StoredBookmarks = table.Column<string>(type: "TEXT", nullable: true),
-                    TimelineZoom = table.Column<double>(type: "REAL", nullable: false),
-                    Version = table.Column<string>(type: "TEXT", nullable: true),
-                    WidescreenStoryboard = table.Column<bool>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapDifficulty_BaseDifficultyID",
-                        column: x => x.BaseDifficultyID,
-                        principalTable: "BeatmapDifficulty",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapSetInfo_BeatmapSetInfoID",
-                        column: x => x.BeatmapSetInfoID,
-                        principalTable: "BeatmapSetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_BeatmapMetadata_MetadataID",
-                        column: x => x.MetadataID,
-                        principalTable: "BeatmapMetadata",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_BeatmapInfo_RulesetInfo_RulesetID",
-                        column: x => x.RulesetID,
-                        principalTable: "RulesetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BeatmapSetFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    BeatmapSetInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    FileInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Filename = table.Column<string>(type: "TEXT", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BeatmapSetFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetFileInfo_BeatmapSetInfo_BeatmapSetInfoID",
-                        column: x => x.BeatmapSetInfoID,
-                        principalTable: "BeatmapSetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_BeatmapSetFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_BaseDifficultyID",
-                table: "BeatmapInfo",
-                column: "BaseDifficultyID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_BeatmapSetInfoID",
-                table: "BeatmapInfo",
-                column: "BeatmapSetInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MetadataID",
-                table: "BeatmapInfo",
-                column: "MetadataID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_RulesetID",
-                table: "BeatmapInfo",
-                column: "RulesetID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetFileInfo_BeatmapSetInfoID",
-                table: "BeatmapSetFileInfo",
-                column: "BeatmapSetInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetFileInfo_FileInfoID",
-                table: "BeatmapSetFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_DeletePending",
-                table: "BeatmapSetInfo",
-                column: "DeletePending");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_MetadataID",
-                table: "BeatmapSetInfo",
-                column: "MetadataID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FileInfo_Hash",
-                table: "FileInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_FileInfo_ReferenceCount",
-                table: "FileInfo",
-                column: "ReferenceCount");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Action",
-                table: "KeyBinding",
-                column: "Action");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding",
-                column: "Variant");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RulesetInfo_Available",
-                table: "RulesetInfo",
-                column: "Available");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "BeatmapInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapSetFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "KeyBinding");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapDifficulty");
-
-            migrationBuilder.DropTable(
-                name: "RulesetInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapSetInfo");
-
-            migrationBuilder.DropTable(
-                name: "FileInfo");
-
-            migrationBuilder.DropTable(
-                name: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs b/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
deleted file mode 100644
index 4cd234f2ef..0000000000
--- a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.Designer.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171025071459_AddMissingIndexRules")]
-    partial class AddMissingIndexRules
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs b/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
deleted file mode 100644
index 4ec3952941..0000000000
--- a/osu.Game/Migrations/20171025071459_AddMissingIndexRules.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddMissingIndexRules : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_OnlineBeatmapSetID",
-                table: "BeatmapSetInfo",
-                column: "OnlineBeatmapSetID",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapSetInfo_OnlineBeatmapSetID",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapSetInfo_Hash",
-                table: "BeatmapSetInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs b/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
deleted file mode 100644
index 006acf12cd..0000000000
--- a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.Designer.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171119065731_AddBeatmapOnlineIDUniqueConstraint")]
-    partial class AddBeatmapOnlineIDUniqueConstraint
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs b/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
deleted file mode 100644
index 6aba12f86f..0000000000
--- a/osu.Game/Migrations/20171119065731_AddBeatmapOnlineIDUniqueConstraint.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBeatmapOnlineIDUniqueConstraint : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_OnlineBeatmapID",
-                table: "BeatmapInfo",
-                column: "OnlineBeatmapID",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_OnlineBeatmapID",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs b/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
deleted file mode 100644
index fc2496bc24..0000000000
--- a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.Designer.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20171209034410_AddRulesetInfoShortName")]
-    partial class AddRulesetInfoShortName
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs b/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
deleted file mode 100644
index 5688455f79..0000000000
--- a/osu.Game/Migrations/20171209034410_AddRulesetInfoShortName.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddRulesetInfoShortName : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "ShortName",
-                table: "RulesetInfo",
-                type: "TEXT",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_RulesetInfo_ShortName",
-                table: "RulesetInfo",
-                column: "ShortName",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_RulesetInfo_ShortName",
-                table: "RulesetInfo");
-
-            migrationBuilder.DropColumn(
-                name: "ShortName",
-                table: "RulesetInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180125143340_Settings.Designer.cs b/osu.Game/Migrations/20180125143340_Settings.Designer.cs
deleted file mode 100644
index 4bb599eec1..0000000000
--- a/osu.Game/Migrations/20180125143340_Settings.Designer.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180125143340_Settings")]
-    partial class Settings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180125143340_Settings.cs b/osu.Game/Migrations/20180125143340_Settings.cs
deleted file mode 100644
index 1feb37531f..0000000000
--- a/osu.Game/Migrations/20180125143340_Settings.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class Settings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding");
-
-            migrationBuilder.CreateTable(
-                name: "Settings",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Key = table.Column<int>(type: "TEXT", nullable: false),
-                    RulesetID = table.Column<int>(type: "INTEGER", nullable: true),
-                    Value = table.Column<string>(type: "TEXT", nullable: true),
-                    Variant = table.Column<int>(type: "INTEGER", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Settings", x => x.ID);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_RulesetID_Variant",
-                table: "KeyBinding",
-                columns: new[] { "RulesetID", "Variant" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Settings_RulesetID_Variant",
-                table: "Settings",
-                columns: new[] { "RulesetID", "Variant" });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Settings");
-
-            migrationBuilder.DropIndex(
-                name: "IX_KeyBinding_RulesetID_Variant",
-                table: "KeyBinding");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_KeyBinding_Variant",
-                table: "KeyBinding",
-                column: "Variant");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180131154205_AddMuteBinding.cs b/osu.Game/Migrations/20180131154205_AddMuteBinding.cs
deleted file mode 100644
index 8646d1d76b..0000000000
--- a/osu.Game/Migrations/20180131154205_AddMuteBinding.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using osu.Game.Database;
-using osu.Game.Input.Bindings;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180131154205_AddMuteBinding")]
-    public partial class AddMuteBinding : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"UPDATE KeyBinding SET Action = Action + 1 WHERE RulesetID IS NULL AND Variant IS NULL AND Action >= {(int)GlobalAction.ToggleMute}");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"DELETE FROM KeyBinding WHERE RulesetID IS NULL AND Variant IS NULL AND Action = {(int)GlobalAction.ToggleMute}");
-            migrationBuilder.Sql($"UPDATE KeyBinding SET Action = Action - 1 WHERE RulesetID IS NULL AND Variant IS NULL AND Action > {(int)GlobalAction.ToggleMute}");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs b/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
deleted file mode 100644
index cdc4ef2e66..0000000000
--- a/osu.Game/Migrations/20180219060912_AddSkins.Designer.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180219060912_AddSkins")]
-    partial class AddSkins
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<float>("SliderMultiplier");
-
-                    b.Property<float>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MD5Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180219060912_AddSkins.cs b/osu.Game/Migrations/20180219060912_AddSkins.cs
deleted file mode 100644
index 319748bed6..0000000000
--- a/osu.Game/Migrations/20180219060912_AddSkins.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkins : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "SkinInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Creator = table.Column<string>(type: "TEXT", nullable: true),
-                    DeletePending = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SkinInfo", x => x.ID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SkinFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    FileInfoID = table.Column<int>(type: "INTEGER", nullable: false),
-                    Filename = table.Column<string>(type: "TEXT", nullable: false),
-                    SkinInfoID = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SkinFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_SkinFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SkinFileInfo_SkinInfo_SkinInfoID",
-                        column: x => x.SkinInfoID,
-                        principalTable: "SkinInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinFileInfo_FileInfoID",
-                table: "SkinFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinFileInfo_SkinInfoID",
-                table: "SkinFileInfo",
-                column: "SkinInfoID");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "SkinFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs b/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
deleted file mode 100644
index f28408bfb3..0000000000
--- a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.Designer.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// <auto-generated />
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using osu.Game.Database;
-using System;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180529055154_RemoveUniqueHashConstraints")]
-    partial class RemoveUniqueHashConstraints
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.0.3-rtm-10026");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs b/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
deleted file mode 100644
index 91eabe8868..0000000000
--- a/osu.Game/Migrations/20180529055154_RemoveUniqueHashConstraints.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RemoveUniqueHashConstraints : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_Hash",
-                table: "BeatmapInfo",
-                column: "Hash",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BeatmapInfo_MD5Hash",
-                table: "BeatmapInfo",
-                column: "MD5Hash",
-                unique: true);
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs b/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
deleted file mode 100644
index aaa11e88b6..0000000000
--- a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.Designer.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180621044111_UpdateTaikoDefaultBindings")]
-    partial class UpdateTaikoDefaultBindings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs b/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
deleted file mode 100644
index d888ccd5a2..0000000000
--- a/osu.Game/Migrations/20180621044111_UpdateTaikoDefaultBindings.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class UpdateTaikoDefaultBindings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE RulesetID = 1");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            // we can't really tell if these should be restored or not, so let's just not do so.
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
deleted file mode 100644
index 7eeacd56d7..0000000000
--- a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.Designer.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180628011956_RemoveNegativeSetIDs")]
-    partial class RemoveNegativeSetIDs
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.1-rtm-30846");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
deleted file mode 100644
index fdea636ac6..0000000000
--- a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RemoveNegativeSetIDs : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            // There was a change that beatmaps were being loaded with "-1" online IDs, which is completely incorrect.
-            // This ensures there will not be unique key conflicts as a result of these incorrectly imported beatmaps.
-            migrationBuilder.Sql("UPDATE BeatmapSetInfo SET OnlineBeatmapSetID = null WHERE OnlineBeatmapSetID <= 0");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs b/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
deleted file mode 100644
index 5ab43da046..0000000000
--- a/osu.Game/Migrations/20180913080842_AddRankStatus.Designer.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20180913080842_AddRankStatus")]
-    partial class AddRankStatus
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.2-rtm-30932");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20180913080842_AddRankStatus.cs b/osu.Game/Migrations/20180913080842_AddRankStatus.cs
deleted file mode 100644
index bb147dff84..0000000000
--- a/osu.Game/Migrations/20180913080842_AddRankStatus.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddRankStatus : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "Status",
-                table: "BeatmapSetInfo",
-                nullable: false,
-                defaultValue: -3); // NONE
-
-            migrationBuilder.AddColumn<int>(
-                name: "Status",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: -3); // NONE
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Status",
-                table: "BeatmapSetInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Status",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs b/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
deleted file mode 100644
index b387a45ecf..0000000000
--- a/osu.Game/Migrations/20181007180454_StandardizePaths.Designer.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181007180454_StandardizePaths")]
-    partial class StandardizePaths
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.3-rtm-32065");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181007180454_StandardizePaths.cs b/osu.Game/Migrations/20181007180454_StandardizePaths.cs
deleted file mode 100644
index 30f27043a0..0000000000
--- a/osu.Game/Migrations/20181007180454_StandardizePaths.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class StandardizePaths : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            string windowsStyle = @"\";
-            string standardized = "/";
-
-            // Escaping \ does not seem to be needed.
-            migrationBuilder.Sql($"UPDATE `BeatmapInfo` SET `Path` = REPLACE(`Path`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapMetadata` SET `AudioFile` = REPLACE(`AudioFile`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapMetadata` SET `BackgroundFile` = REPLACE(`BackgroundFile`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `BeatmapSetFileInfo` SET `Filename` = REPLACE(`Filename`, '{windowsStyle}', '{standardized}')");
-            migrationBuilder.Sql($"UPDATE `SkinFileInfo` SET `Filename` = REPLACE(`Filename`, '{windowsStyle}', '{standardized}')");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs b/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
deleted file mode 100644
index 120674671a..0000000000
--- a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.Designer.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181128100659_AddSkinInfoHash")]
-    partial class AddSkinInfoHash
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs b/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
deleted file mode 100644
index ee825a1e9c..0000000000
--- a/osu.Game/Migrations/20181128100659_AddSkinInfoHash.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkinInfoHash : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Hash",
-                table: "SkinInfo",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinInfo_DeletePending",
-                table: "SkinInfo",
-                column: "DeletePending");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SkinInfo_Hash",
-                table: "SkinInfo",
-                column: "Hash",
-                unique: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_SkinInfo_DeletePending",
-                table: "SkinInfo");
-
-            migrationBuilder.DropIndex(
-                name: "IX_SkinInfo_Hash",
-                table: "SkinInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Hash",
-                table: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs b/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
deleted file mode 100644
index eee53182ce..0000000000
--- a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.Designer.cs
+++ /dev/null
@@ -1,484 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20181130113755_AddScoreInfoTables")]
-    partial class AddScoreInfoTables
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<int>("TotalScore");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany()
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs b/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
deleted file mode 100644
index 58980132f3..0000000000
--- a/osu.Game/Migrations/20181130113755_AddScoreInfoTables.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddScoreInfoTables : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "ScoreInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    Rank = table.Column<int>(nullable: false),
-                    TotalScore = table.Column<int>(nullable: false),
-                    Accuracy = table.Column<double>(type: "DECIMAL(1,4)", nullable: false),
-                    PP = table.Column<double>(nullable: true),
-                    MaxCombo = table.Column<int>(nullable: false),
-                    Combo = table.Column<int>(nullable: false),
-                    RulesetID = table.Column<int>(nullable: false),
-                    Mods = table.Column<string>(nullable: true),
-                    User = table.Column<string>(nullable: true),
-                    BeatmapInfoID = table.Column<int>(nullable: false),
-                    OnlineScoreID = table.Column<long>(nullable: true),
-                    Date = table.Column<DateTimeOffset>(nullable: false),
-                    Statistics = table.Column<string>(nullable: true),
-                    Hash = table.Column<string>(nullable: true),
-                    DeletePending = table.Column<bool>(nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScoreInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_ScoreInfo_BeatmapInfo_BeatmapInfoID",
-                        column: x => x.BeatmapInfoID,
-                        principalTable: "BeatmapInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ScoreInfo_RulesetInfo_RulesetID",
-                        column: x => x.RulesetID,
-                        principalTable: "RulesetInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ScoreFileInfo",
-                columns: table => new
-                {
-                    ID = table.Column<int>(nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    FileInfoID = table.Column<int>(nullable: false),
-                    Filename = table.Column<string>(nullable: false),
-                    ScoreInfoID = table.Column<int>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ScoreFileInfo", x => x.ID);
-                    table.ForeignKey(
-                        name: "FK_ScoreFileInfo_FileInfo_FileInfoID",
-                        column: x => x.FileInfoID,
-                        principalTable: "FileInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ScoreFileInfo_ScoreInfo_ScoreInfoID",
-                        column: x => x.ScoreInfoID,
-                        principalTable: "ScoreInfo",
-                        principalColumn: "ID",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreFileInfo_FileInfoID",
-                table: "ScoreFileInfo",
-                column: "FileInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreFileInfo_ScoreInfoID",
-                table: "ScoreFileInfo",
-                column: "ScoreInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_BeatmapInfoID",
-                table: "ScoreInfo",
-                column: "BeatmapInfoID");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_OnlineScoreID",
-                table: "ScoreInfo",
-                column: "OnlineScoreID",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ScoreInfo_RulesetID",
-                table: "ScoreInfo",
-                column: "RulesetID");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ScoreFileInfo");
-
-            migrationBuilder.DropTable(
-                name: "ScoreInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs b/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
deleted file mode 100644
index 8e1e3a59f3..0000000000
--- a/osu.Game/Migrations/20190225062029_AddUserIDColumn.Designer.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190225062029_AddUserIDColumn")]
-    partial class AddUserIDColumn
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.1-servicing-10028");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntKey")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<int>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs b/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
deleted file mode 100644
index f2eef600dc..0000000000
--- a/osu.Game/Migrations/20190225062029_AddUserIDColumn.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddUserIDColumn : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<long>(
-                name: "UserID",
-                table: "ScoreInfo",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "UserID",
-                table: "ScoreInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs b/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
deleted file mode 100644
index 348c42adb9..0000000000
--- a/osu.Game/Migrations/20190525060824_SkinSettings.Designer.cs
+++ /dev/null
@@ -1,498 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190525060824_SkinSettings")]
-    partial class SkinSettings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190525060824_SkinSettings.cs b/osu.Game/Migrations/20190525060824_SkinSettings.cs
deleted file mode 100644
index 7779b55bb7..0000000000
--- a/osu.Game/Migrations/20190525060824_SkinSettings.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class SkinSettings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql(@"create table Settings_dg_tmp
-            (
-	            ID INTEGER not null
-		            constraint PK_Settings
-			            primary key autoincrement,
-	            Key TEXT not null,
-	            RulesetID INTEGER,
-	            Value TEXT,
-	            Variant INTEGER,
-	            SkinInfoID int
-		            constraint Settings_SkinInfo_ID_fk
-			            references SkinInfo
-				            on delete restrict
-            );
-
-            insert into Settings_dg_tmp(ID, Key, RulesetID, Value, Variant) select ID, Key, RulesetID, Value, Variant from Settings;
-
-            drop table Settings;
-
-            alter table Settings_dg_tmp rename to Settings;
-
-            create index IX_Settings_RulesetID_Variant
-	            on Settings (RulesetID, Variant);
-
-            create index Settings_SkinInfoID_index
-	            on Settings (SkinInfoID);
-
-            ");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Settings_SkinInfo_SkinInfoID",
-                table: "Settings");
-
-            migrationBuilder.DropIndex(
-                name: "IX_Settings_SkinInfoID",
-                table: "Settings");
-
-            migrationBuilder.DropColumn(
-                name: "SkinInfoID",
-                table: "Settings");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs b/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
deleted file mode 100644
index 9477369aa0..0000000000
--- a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.Designer.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190605091246_AddDateAddedColumnToBeatmapSet")]
-    partial class AddDateAddedColumnToBeatmapSet
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs b/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
deleted file mode 100644
index 0620a0624f..0000000000
--- a/osu.Game/Migrations/20190605091246_AddDateAddedColumnToBeatmapSet.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddDateAddedColumnToBeatmapSet : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<DateTimeOffset>(
-                name: "DateAdded",
-                table: "BeatmapSetInfo",
-                nullable: false,
-                defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "DateAdded",
-                table: "BeatmapSetInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs b/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
deleted file mode 100644
index c5fcc16f84..0000000000
--- a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.Designer.cs
+++ /dev/null
@@ -1,504 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190708070844_AddBPMAndLengthColumns")]
-    partial class AddBPMAndLengthColumns
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs b/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
deleted file mode 100644
index f8ce354aa1..0000000000
--- a/osu.Game/Migrations/20190708070844_AddBPMAndLengthColumns.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBPMAndLengthColumns : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<double>(
-                name: "BPM",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0.0);
-
-            migrationBuilder.AddColumn<double>(
-                name: "Length",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0.0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "BPM",
-                table: "BeatmapInfo");
-
-            migrationBuilder.DropColumn(
-                name: "Length",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs b/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
deleted file mode 100644
index 826233a2b0..0000000000
--- a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20190913104727_AddBeatmapVideo")]
-    partial class AddBeatmapVideo
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs b/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
deleted file mode 100644
index af82b4db20..0000000000
--- a/osu.Game/Migrations/20190913104727_AddBeatmapVideo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddBeatmapVideo : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "VideoFile",
-                table: "BeatmapMetadata",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "VideoFile",
-                table: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
deleted file mode 100644
index 22316b0380..0000000000
--- a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20200302094919_RefreshVolumeBindings")]
-    partial class RefreshVolumeBindings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
deleted file mode 100644
index 3d2ddbf6fc..0000000000
--- a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RefreshVolumeBindings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
deleted file mode 100644
index 1c05de832e..0000000000
--- a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.Designer.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20201019224408_AddEpilepsyWarning")]
-    partial class AddEpilepsyWarning
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs b/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
deleted file mode 100644
index 58a35a7bf3..0000000000
--- a/osu.Game/Migrations/20201019224408_AddEpilepsyWarning.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddEpilepsyWarning : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "EpilepsyWarning",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "EpilepsyWarning",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
deleted file mode 100644
index 2c100d39b9..0000000000
--- a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210412045700_RefreshVolumeBindingsAgain")]
-    partial class RefreshVolumeBindingsAgain
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.Property<string>("VideoFile");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<long?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
deleted file mode 100644
index 4d3941dd20..0000000000
--- a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class RefreshVolumeBindingsAgain : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
deleted file mode 100644
index b808c648da..0000000000
--- a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210511060743_AddSkinInstantiationInfo")]
-    partial class AddSkinInstantiationInfo
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
deleted file mode 100644
index 887635fa85..0000000000
--- a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSkinInstantiationInfo : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "InstantiationInfo",
-                table: "SkinInfo",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "InstantiationInfo",
-                table: "SkinInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
deleted file mode 100644
index 89bab3a0fa..0000000000
--- a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210514062639_AddAuthorIdToBeatmapMetadata")]
-    partial class AddAuthorIdToBeatmapMetadata
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<bool>("Countdown");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
deleted file mode 100644
index 7b579e27b9..0000000000
--- a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddAuthorIdToBeatmapMetadata : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "AuthorID",
-                table: "BeatmapMetadata",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "AuthorID",
-                table: "BeatmapMetadata");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs b/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
deleted file mode 100644
index afeb42130d..0000000000
--- a/osu.Game/Migrations/20210824185035_AddCountdownSettings.Designer.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210824185035_AddCountdownSettings")]
-    partial class AddCountdownSettings
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs b/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
deleted file mode 100644
index d1b09e2c1d..0000000000
--- a/osu.Game/Migrations/20210824185035_AddCountdownSettings.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddCountdownSettings : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "CountdownOffset",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: 0);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "CountdownOffset",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs b/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
deleted file mode 100644
index 6e53d7fae0..0000000000
--- a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.Designer.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20210912144011_AddSamplesMatchPlaybackRate")]
-    partial class AddSamplesMatchPlaybackRate
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SamplesMatchPlaybackRate");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs b/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
deleted file mode 100644
index f6fc1f4420..0000000000
--- a/osu.Game/Migrations/20210912144011_AddSamplesMatchPlaybackRate.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Migrations;
-
-namespace osu.Game.Migrations
-{
-    public partial class AddSamplesMatchPlaybackRate : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "SamplesMatchPlaybackRate",
-                table: "BeatmapInfo",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SamplesMatchPlaybackRate",
-                table: "BeatmapInfo");
-        }
-    }
-}
diff --git a/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs b/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
deleted file mode 100644
index 6d53c019ec..0000000000
--- a/osu.Game/Migrations/20211020081609_ResetSkinHashes.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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 Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    [Migration("20211020081609_ResetSkinHashes")]
-    public partial class ResetSkinHashes : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.Sql($"UPDATE SkinInfo SET Hash = null");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
deleted file mode 100644
index 036c26cb0a..0000000000
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using osu.Game.Database;
-
-namespace osu.Game.Migrations
-{
-    [DbContext(typeof(OsuDbContext))]
-    partial class OsuDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<float>("ApproachRate");
-
-                    b.Property<float>("CircleSize");
-
-                    b.Property<float>("DrainRate");
-
-                    b.Property<float>("OverallDifficulty");
-
-                    b.Property<double>("SliderMultiplier");
-
-                    b.Property<double>("SliderTickRate");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapDifficulty");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("AudioLeadIn");
-
-                    b.Property<double>("BPM");
-
-                    b.Property<int>("BaseDifficultyID");
-
-                    b.Property<int>("BeatDivisor");
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("Countdown");
-
-                    b.Property<int>("CountdownOffset");
-
-                    b.Property<double>("DistanceSpacing");
-
-                    b.Property<bool>("EpilepsyWarning");
-
-                    b.Property<int>("GridSize");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<bool>("Hidden");
-
-                    b.Property<double>("Length");
-
-                    b.Property<bool>("LetterboxInBreaks");
-
-                    b.Property<string>("MD5Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapID");
-
-                    b.Property<string>("Path");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<bool>("SamplesMatchPlaybackRate");
-
-                    b.Property<bool>("SpecialStyle");
-
-                    b.Property<float>("StackLeniency");
-
-                    b.Property<double>("StarDifficulty");
-
-                    b.Property<int>("Status");
-
-                    b.Property<string>("StoredBookmarks");
-
-                    b.Property<double>("TimelineZoom");
-
-                    b.Property<string>("Version");
-
-                    b.Property<bool>("WidescreenStoryboard");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BaseDifficultyID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("Hash");
-
-                    b.HasIndex("MD5Hash");
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("BeatmapInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Artist");
-
-                    b.Property<string>("ArtistUnicode");
-
-                    b.Property<string>("AudioFile");
-
-                    b.Property<int>("AuthorID")
-                        .HasColumnName("AuthorID");
-
-                    b.Property<string>("AuthorString")
-                        .HasColumnName("Author");
-
-                    b.Property<string>("BackgroundFile");
-
-                    b.Property<int>("PreviewTime");
-
-                    b.Property<string>("Source");
-
-                    b.Property<string>("Tags");
-
-                    b.Property<string>("Title");
-
-                    b.Property<string>("TitleUnicode");
-
-                    b.HasKey("ID");
-
-                    b.ToTable("BeatmapMetadata");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("BeatmapSetInfoID");
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapSetInfoID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.ToTable("BeatmapSetFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<DateTimeOffset>("DateAdded");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int?>("MetadataID");
-
-                    b.Property<int?>("OnlineBeatmapSetID");
-
-                    b.Property<bool>("Protected");
-
-                    b.Property<int>("Status");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("MetadataID");
-
-                    b.HasIndex("OnlineBeatmapSetID")
-                        .IsUnique();
-
-                    b.ToTable("BeatmapSetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Key")
-                        .HasColumnName("Key");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("SkinInfoID");
-
-                    b.Property<string>("StringValue")
-                        .HasColumnName("Value");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("Settings");
-                });
-
-            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("ReferenceCount");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.HasIndex("ReferenceCount");
-
-                    b.ToTable("FileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("IntAction")
-                        .HasColumnName("Action");
-
-                    b.Property<string>("KeysString")
-                        .HasColumnName("Keys");
-
-                    b.Property<int?>("RulesetID");
-
-                    b.Property<int?>("Variant");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("IntAction");
-
-                    b.HasIndex("RulesetID", "Variant");
-
-                    b.ToTable("KeyBinding");
-                });
-
-            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
-                {
-                    b.Property<int?>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<bool>("Available");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("ShortName");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("Available");
-
-                    b.HasIndex("ShortName")
-                        .IsUnique();
-
-                    b.ToTable("RulesetInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int?>("ScoreInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("ScoreInfoID");
-
-                    b.ToTable("ScoreFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<double>("Accuracy")
-                        .HasColumnType("DECIMAL(1,4)");
-
-                    b.Property<int>("BeatmapInfoID");
-
-                    b.Property<int>("Combo");
-
-                    b.Property<DateTimeOffset>("Date");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<int>("MaxCombo");
-
-                    b.Property<string>("ModsJson")
-                        .HasColumnName("Mods");
-
-                    b.Property<long?>("OnlineScoreID");
-
-                    b.Property<double?>("PP");
-
-                    b.Property<int>("Rank");
-
-                    b.Property<int>("RulesetID");
-
-                    b.Property<string>("StatisticsJson")
-                        .HasColumnName("Statistics");
-
-                    b.Property<long>("TotalScore");
-
-                    b.Property<int?>("UserID")
-                        .HasColumnName("UserID");
-
-                    b.Property<string>("UserString")
-                        .HasColumnName("User");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("BeatmapInfoID");
-
-                    b.HasIndex("OnlineScoreID")
-                        .IsUnique();
-
-                    b.HasIndex("RulesetID");
-
-                    b.ToTable("ScoreInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<int>("FileInfoID");
-
-                    b.Property<string>("Filename")
-                        .IsRequired();
-
-                    b.Property<int>("SkinInfoID");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("FileInfoID");
-
-                    b.HasIndex("SkinInfoID");
-
-                    b.ToTable("SkinFileInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
-                {
-                    b.Property<int>("ID")
-                        .ValueGeneratedOnAdd();
-
-                    b.Property<string>("Creator");
-
-                    b.Property<bool>("DeletePending");
-
-                    b.Property<string>("Hash");
-
-                    b.Property<string>("InstantiationInfo");
-
-                    b.Property<string>("Name");
-
-                    b.HasKey("ID");
-
-                    b.HasIndex("DeletePending");
-
-                    b.HasIndex("Hash")
-                        .IsUnique();
-
-                    b.ToTable("SkinInfo");
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
-                        .WithMany()
-                        .HasForeignKey("BaseDifficultyID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("Beatmaps")
-                        .HasForeignKey("MetadataID");
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("BeatmapSetInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
-                        .WithMany("BeatmapSets")
-                        .HasForeignKey("MetadataID");
-                });
-
-            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
-                {
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Settings")
-                        .HasForeignKey("SkinInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Scoring.ScoreInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("ScoreInfoID");
-                });
-
-            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
-                {
-                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
-                        .WithMany("Scores")
-                        .HasForeignKey("BeatmapInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
-                        .WithMany()
-                        .HasForeignKey("RulesetID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
-                {
-                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
-                        .WithMany()
-                        .HasForeignKey("FileInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("osu.Game.Skinning.SkinInfo")
-                        .WithMany("Files")
-                        .HasForeignKey("SkinInfoID")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 97142d5472..b30a065371 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -199,11 +199,6 @@ namespace osu.Game
 
         private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(global_track_volume_adjust);
 
-        /// <summary>
-        /// A legacy EF context factory if migration has not been performed to realm yet.
-        /// </summary>
-        protected DatabaseContextFactory EFContextFactory { get; private set; }
-
         /// <summary>
         /// Number of unhandled exceptions to allow before aborting execution.
         /// </summary>
@@ -242,10 +237,7 @@ namespace osu.Game
 
             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
 
-            if (Storage.Exists(DatabaseContextFactory.DATABASE_NAME))
-                dependencies.Cache(EFContextFactory = new DatabaseContextFactory(Storage));
-
-            dependencies.Cache(realm = new RealmAccess(Storage, CLIENT_DATABASE_FILENAME, Host.UpdateThread, EFContextFactory));
+            dependencies.Cache(realm = new RealmAccess(Storage, CLIENT_DATABASE_FILENAME, Host.UpdateThread));
 
             dependencies.CacheAs<RulesetStore>(RulesetStore = new RealmRulesetStore(realm, Storage));
             dependencies.CacheAs<IRulesetStore>(RulesetStore);
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index dbb1278d76..afba00274c 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -14,7 +14,6 @@ using osu.Game.Screens.Menu;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using IntroSequence = osu.Game.Configuration.IntroSequence;
 
@@ -66,32 +65,13 @@ namespace osu.Game.Screens
 
         protected virtual ShaderPrecompiler CreateShaderPrecompiler() => new ShaderPrecompiler();
 
-        [Resolved(canBeNull: true)]
-        private DatabaseContextFactory efContextFactory { get; set; }
-
-        private EFToRealmMigrator realmMigrator;
-
         public override void OnEntering(ScreenTransitionEvent e)
         {
             base.OnEntering(e);
 
             LoadComponentAsync(precompiler = CreateShaderPrecompiler(), AddInternal);
 
-            // A non-null context factory means there's still content to migrate.
-            if (efContextFactory != null)
-            {
-                LoadComponentAsync(realmMigrator = new EFToRealmMigrator(), AddInternal);
-                realmMigrator.MigrationCompleted.ContinueWith(_ => Schedule(() =>
-                {
-                    // Delay initial screen loading to ensure that the migration is in a complete and sane state
-                    // before the intro screen may import the game intro beatmap.
-                    LoadComponentAsync(loadableScreen = CreateLoadableScreen());
-                }));
-            }
-            else
-            {
-                LoadComponentAsync(loadableScreen = CreateLoadableScreen());
-            }
+            LoadComponentAsync(loadableScreen = CreateLoadableScreen());
 
             LoadComponentAsync(spinner = new LoadingSpinner(true, true)
             {
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 3ad29ea6db..44df495929 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -807,7 +807,6 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Microsoft_002EExtensions_002ELogging_002E_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Microsoft_002EToolkit_002EHighPerformance_002EBox_002A/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=NUnit_002EFramework_002EInternal_002ELogger/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=OpenTabletDriver_002EPlugin_002EDependencyInjection_002E_002A/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=Realms_002ELogging_002ELogger/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/AutoImport2/=CSHARP/BlackLists/=System_002EComponentModel_002EComponent/@EntryIndexedValue">True</s:Boolean>

From 0aa92c78ec0ae000f8f241db3b5a65a6ea28b7bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:34:35 +0900
Subject: [PATCH 335/709] Add local sqlite initialisation to
 `BeatmapUpdaterMetadataLookup` for now

---
 osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index aa773da6d3..007bec46bb 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -19,6 +19,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.BZip2;
+using SQLitePCL;
 
 namespace osu.Game.Beatmaps
 {
@@ -41,6 +42,10 @@ namespace osu.Game.Beatmaps
 
         public BeatmapUpdaterMetadataLookup(IAPIProvider api, Storage storage)
         {
+            // required to initialise native SQLite libraries on some platforms.
+            Batteries_V2.Init();
+            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+
             this.api = api;
             this.storage = storage;
 

From 581a4d2d6d033069af55d972e345f0d63b29a2fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:39:59 +0900
Subject: [PATCH 336/709] Use `APIBeatmap` for realm migration requiring
 `ShortName` mapping

---
 osu.Game/Database/RealmAccess.cs              | 20 ++++++++++++-------
 .../API/Requests/Responses/APIBeatmap.cs      |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index e23fc912df..cefc7da503 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -24,6 +24,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Models;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -45,8 +46,6 @@ namespace osu.Game.Database
         /// </summary>
         public readonly string Filename;
 
-        private readonly IDatabaseContextFactory? efContextFactory;
-
         private readonly SynchronizationContext? updateThreadSyncContext;
 
         /// <summary>
@@ -162,11 +161,9 @@ namespace osu.Game.Database
         /// <param name="storage">The game storage which will be used to create the realm backing file.</param>
         /// <param name="filename">The filename to use for the realm backing file. A ".realm" extension will be added automatically if not specified.</param>
         /// <param name="updateThread">The game update thread, used to post realm operations into a thread-safe context.</param>
-        /// <param name="efContextFactory">An EF factory used only for migration purposes.</param>
-        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null, IDatabaseContextFactory? efContextFactory = null)
+        public RealmAccess(Storage storage, string filename, GameThread? updateThread = null)
         {
             this.storage = storage;
-            this.efContextFactory = efContextFactory;
 
             updateThreadSyncContext = updateThread?.SynchronizationContext ?? SynchronizationContext.Current;
 
@@ -876,8 +873,17 @@ namespace osu.Game.Database
             }
         }
 
-        private string? getRulesetShortNameFromLegacyID(long rulesetId) =>
-            efContextFactory?.Get().RulesetInfo.FirstOrDefault(r => r.ID == rulesetId)?.ShortName;
+        private string? getRulesetShortNameFromLegacyID(long rulesetId)
+        {
+            try
+            {
+                return new APIBeatmap.APIRuleset { OnlineID = (int)rulesetId }.ShortName;
+            }
+            catch
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// Create a full realm backup.
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index 3fee81cf33..8a77801c3a 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool Equals(IBeatmapInfo? other) => other is APIBeatmap b && this.MatchesOnlineID(b);
 
-        private class APIRuleset : IRulesetInfo
+        public class APIRuleset : IRulesetInfo
         {
             public int OnlineID { get; set; } = -1;
 

From 65d1c40dd54ec556ca28e30f01bfb16a56a5e048 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:47:26 +0900
Subject: [PATCH 337/709] Remove remaining package references and replace with
 `SQLitePCLRaw` direct reference

This may require further consideration for test and iOS projects.
---
 .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj              | 1 -
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                   | 1 -
 .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj             | 1 -
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                   | 1 -
 osu.Desktop/osu.Desktop.csproj                                | 1 -
 .../osu.Game.Rulesets.Catch.Tests.csproj                      | 1 -
 .../osu.Game.Rulesets.Mania.Tests.csproj                      | 1 -
 .../osu.Game.Rulesets.Osu.Tests.csproj                        | 1 -
 .../osu.Game.Rulesets.Taiko.Tests.csproj                      | 1 -
 osu.Game.Tests/osu.Game.Tests.csproj                          | 1 -
 osu.Game/osu.Game.csproj                                      | 4 ++--
 osu.iOS.props                                                 | 2 --
 12 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
index 011a37cbdc..b8604169aa 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index c04f6132f3..4117452579 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
index 529054fd4f..0b119c8680 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index c04f6132f3..4117452579 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 8ef480d4e3..3f926ed45a 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,7 +27,6 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 3ac1491946..d45f8a9692 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index d07df75864..2951076591 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 36c40c0fe2..c2973644cf 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -5,7 +5,6 @@
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index 51d4bbc630..e8eaff4368 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -4,7 +4,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 65679deb01..2572864e09 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,6 @@
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fabef87c28..953087f9c8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,8 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -41,6 +40,7 @@
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 89166f924c..496bfbb85c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -81,8 +81,6 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />

From 28b15e232df3d8b6b9cc38b14d22819510e7b2f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:59:03 +0900
Subject: [PATCH 338/709] Remove all EF models

---
 osu.Game/Beatmaps/BeatmapSetFileInfo.cs  |  31 ---
 osu.Game/Beatmaps/EFBeatmapDifficulty.cs |  80 -------
 osu.Game/Beatmaps/EFBeatmapInfo.cs       | 183 ---------------
 osu.Game/Beatmaps/EFBeatmapMetadata.cs   |  89 --------
 osu.Game/Beatmaps/EFBeatmapSetInfo.cs    | 108 ---------
 osu.Game/Rulesets/EFRulesetInfo.cs       |  87 --------
 osu.Game/Scoring/EFScoreInfo.cs          | 272 -----------------------
 osu.Game/Scoring/ScoreFileInfo.cs        |  31 ---
 osu.Game/Skinning/EFSkinInfo.cs          |  65 ------
 osu.Game/Skinning/SkinFileInfo.cs        |  31 ---
 10 files changed, 977 deletions(-)
 delete mode 100644 osu.Game/Beatmaps/BeatmapSetFileInfo.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapDifficulty.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapInfo.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapMetadata.cs
 delete mode 100644 osu.Game/Beatmaps/EFBeatmapSetInfo.cs
 delete mode 100644 osu.Game/Rulesets/EFRulesetInfo.cs
 delete mode 100644 osu.Game/Scoring/EFScoreInfo.cs
 delete mode 100644 osu.Game/Scoring/ScoreFileInfo.cs
 delete mode 100644 osu.Game/Skinning/EFSkinInfo.cs
 delete mode 100644 osu.Game/Skinning/SkinFileInfo.cs

diff --git a/osu.Game/Beatmaps/BeatmapSetFileInfo.cs b/osu.Game/Beatmaps/BeatmapSetFileInfo.cs
deleted file mode 100644
index 051366fb99..0000000000
--- a/osu.Game/Beatmaps/BeatmapSetFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Beatmaps
-{
-    public class BeatmapSetFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapSetInfoID { get; set; }
-
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapDifficulty.cs b/osu.Game/Beatmaps/EFBeatmapDifficulty.cs
deleted file mode 100644
index 8bcac24ca1..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapDifficulty.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using osu.Game.Database;
-
-namespace osu.Game.Beatmaps
-{
-    [Table(@"BeatmapDifficulty")]
-    public class EFBeatmapDifficulty : IHasPrimaryKey, IBeatmapDifficultyInfo
-    {
-        /// <summary>
-        /// The default value used for all difficulty settings except <see cref="SliderMultiplier"/> and <see cref="SliderTickRate"/>.
-        /// </summary>
-        public const float DEFAULT_DIFFICULTY = 5;
-
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
-        public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
-        public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
-
-        private float? approachRate;
-
-        public EFBeatmapDifficulty()
-        {
-        }
-
-        public EFBeatmapDifficulty(IBeatmapDifficultyInfo source)
-        {
-            CopyFrom(source);
-        }
-
-        public float ApproachRate
-        {
-            get => approachRate ?? OverallDifficulty;
-            set => approachRate = value;
-        }
-
-        public double SliderMultiplier { get; set; } = 1;
-        public double SliderTickRate { get; set; } = 1;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapDifficulty"/>.
-        /// </summary>
-        public EFBeatmapDifficulty Clone()
-        {
-            var diff = (EFBeatmapDifficulty)Activator.CreateInstance(GetType());
-            CopyTo(diff);
-            return diff;
-        }
-
-        public virtual void CopyFrom(IBeatmapDifficultyInfo other)
-        {
-            ApproachRate = other.ApproachRate;
-            DrainRate = other.DrainRate;
-            CircleSize = other.CircleSize;
-            OverallDifficulty = other.OverallDifficulty;
-
-            SliderMultiplier = other.SliderMultiplier;
-            SliderTickRate = other.SliderTickRate;
-        }
-
-        public virtual void CopyTo(EFBeatmapDifficulty other)
-        {
-            other.ApproachRate = ApproachRate;
-            other.DrainRate = DrainRate;
-            other.CircleSize = CircleSize;
-            other.OverallDifficulty = OverallDifficulty;
-
-            other.SliderMultiplier = SliderMultiplier;
-            other.SliderTickRate = SliderTickRate;
-        }
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapInfo.cs b/osu.Game/Beatmaps/EFBeatmapInfo.cs
deleted file mode 100644
index 20abdc686a..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapInfo.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Scoring;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapInfo")]
-    public class EFBeatmapInfo : IEquatable<EFBeatmapInfo>, IHasPrimaryKey, IBeatmapInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int BeatmapVersion;
-
-        private int? onlineID;
-
-        [JsonProperty("id")]
-        [Column("OnlineBeatmapID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        [JsonIgnore]
-        public int BeatmapSetInfoID { get; set; }
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        [Required]
-        public EFBeatmapSetInfo BeatmapSetInfo { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [JsonIgnore]
-        public int BaseDifficultyID { get; set; }
-
-        public EFBeatmapDifficulty BaseDifficulty { get; set; }
-
-        [NotMapped]
-        public APIBeatmap OnlineInfo { get; set; }
-
-        /// <summary>
-        /// The playable length in milliseconds of this beatmap.
-        /// </summary>
-        public double Length { get; set; }
-
-        /// <summary>
-        /// The most common BPM of this beatmap.
-        /// </summary>
-        public double BPM { get; set; }
-
-        public string Path { get; set; }
-
-        [JsonProperty("file_sha2")]
-        public string Hash { get; set; }
-
-        [JsonIgnore]
-        public bool Hidden { get; set; }
-
-        /// <summary>
-        /// MD5 is kept for legacy support (matching against replays, osu-web-10 etc.).
-        /// </summary>
-        [JsonProperty("file_md5")]
-        public string MD5Hash { get; set; }
-
-        // General
-        public double AudioLeadIn { get; set; }
-        public float StackLeniency { get; set; } = 0.7f;
-        public bool SpecialStyle { get; set; }
-
-        [Column("RulesetID")]
-        public int RulesetInfoID { get; set; }
-
-        public EFRulesetInfo RulesetInfo { get; set; }
-
-        public bool LetterboxInBreaks { get; set; }
-        public bool WidescreenStoryboard { get; set; }
-        public bool EpilepsyWarning { get; set; }
-
-        /// <summary>
-        /// Whether or not sound samples should change rate when playing with speed-changing mods.
-        /// TODO: only read/write supported for now, requires implementation in gameplay.
-        /// </summary>
-        public bool SamplesMatchPlaybackRate { get; set; }
-
-        public CountdownType Countdown { get; set; } = CountdownType.Normal;
-
-        /// <summary>
-        /// The number of beats to move the countdown backwards (compared to its default location).
-        /// </summary>
-        public int CountdownOffset { get; set; }
-
-        [NotMapped]
-        public int[] Bookmarks { get; set; } = Array.Empty<int>();
-
-        public double DistanceSpacing { get; set; }
-        public int BeatDivisor { get; set; }
-        public int GridSize { get; set; }
-        public double TimelineZoom { get; set; }
-
-        // Metadata
-        [Column("Version")]
-        public string DifficultyName { get; set; }
-
-        [JsonProperty("difficulty_rating")]
-        [Column("StarDifficulty")]
-        public double StarRating { get; set; }
-
-        /// <summary>
-        /// Currently only populated for beatmap deletion. Use <see cref="ScoreManager"/> to query scores.
-        /// </summary>
-        public List<EFScoreInfo> Scores { get; set; }
-
-        [JsonIgnore]
-        public DifficultyRating DifficultyRating => StarDifficulty.GetDifficultyRating(StarRating);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        public bool Equals(EFBeatmapInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapInfo other) => other is EFBeatmapInfo b && Equals(b);
-
-        public bool AudioEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                        BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                        (Metadata ?? BeatmapSetInfo.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).AudioFile;
-
-        public bool BackgroundEquals(EFBeatmapInfo other) => other != null && BeatmapSetInfo != null && other.BeatmapSetInfo != null &&
-                                                             BeatmapSetInfo.Hash == other.BeatmapSetInfo.Hash &&
-                                                             (Metadata ?? BeatmapSetInfo.Metadata).BackgroundFile == (other.Metadata ?? other.BeatmapSetInfo.Metadata).BackgroundFile;
-
-        /// <summary>
-        /// Returns a shallow-clone of this <see cref="EFBeatmapInfo"/>.
-        /// </summary>
-        public EFBeatmapInfo Clone() => (EFBeatmapInfo)MemberwiseClone();
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapInfo
-
-        [JsonIgnore]
-        IBeatmapMetadataInfo IBeatmapInfo.Metadata => Metadata ?? BeatmapSetInfo?.Metadata ?? new EFBeatmapMetadata();
-
-        [JsonIgnore]
-        IBeatmapDifficultyInfo IBeatmapInfo.Difficulty => BaseDifficulty;
-
-        [JsonIgnore]
-        IBeatmapSetInfo IBeatmapInfo.BeatmapSet => BeatmapSetInfo;
-
-        [JsonIgnore]
-        IRulesetInfo IBeatmapInfo.Ruleset => RulesetInfo;
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapMetadata.cs b/osu.Game/Beatmaps/EFBeatmapMetadata.cs
deleted file mode 100644
index c0588f128c..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapMetadata.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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.ComponentModel.DataAnnotations.Schema;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Users;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapMetadata")]
-    public class EFBeatmapMetadata : IEquatable<EFBeatmapMetadata>, IHasPrimaryKey, IBeatmapMetadataInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public string Title { get; set; } = string.Empty;
-
-        [JsonProperty("title_unicode")]
-        public string TitleUnicode { get; set; } = string.Empty;
-
-        public string Artist { get; set; } = string.Empty;
-
-        [JsonProperty("artist_unicode")]
-        public string ArtistUnicode { get; set; } = string.Empty;
-
-        [JsonIgnore]
-        public List<EFBeatmapInfo> Beatmaps { get; set; } = new List<EFBeatmapInfo>();
-
-        [JsonIgnore]
-        public List<EFBeatmapSetInfo> BeatmapSets { get; set; } = new List<EFBeatmapSetInfo>();
-
-        /// <summary>
-        /// The author of the beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public APIUser Author = new APIUser();
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"user_id")]
-        [Column("AuthorID")]
-        public int AuthorID
-        {
-            get => Author.Id; // This should not be used, but is required to make EF work correctly.
-            set => Author.Id = value;
-        }
-
-        /// <summary>
-        /// Helper property to deserialize a username to <see cref="APIUser"/>.
-        /// </summary>
-        [JsonProperty(@"creator")]
-        [Column("Author")]
-        public string AuthorString
-        {
-            get => Author.Username; // This should not be used, but is required to make EF work correctly.
-            set => Author.Username = value;
-        }
-
-        public string Source { get; set; } = string.Empty;
-
-        [JsonProperty(@"tags")]
-        public string Tags { get; set; } = string.Empty;
-
-        /// <summary>
-        /// The time in milliseconds to begin playing the track for preview purposes.
-        /// If -1, the track should begin playing at 40% of its length.
-        /// </summary>
-        public int PreviewTime { get; set; } = -1;
-
-        public string AudioFile { get; set; } = string.Empty;
-
-        public string BackgroundFile { get; set; } = string.Empty;
-
-        public bool Equals(EFBeatmapMetadata other) => ((IBeatmapMetadataInfo)this).Equals(other);
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        IUser IBeatmapMetadataInfo.Author => Author;
-    }
-}
diff --git a/osu.Game/Beatmaps/EFBeatmapSetInfo.cs b/osu.Game/Beatmaps/EFBeatmapSetInfo.cs
deleted file mode 100644
index 1f41d3727c..0000000000
--- a/osu.Game/Beatmaps/EFBeatmapSetInfo.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-using osu.Game.Database;
-using osu.Game.Extensions;
-
-namespace osu.Game.Beatmaps
-{
-    [ExcludeFromDynamicCompile]
-    [Serializable]
-    [Table(@"BeatmapSetInfo")]
-    public class EFBeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<EFBeatmapSetInfo>, IBeatmapSetInfo
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        private int? onlineID;
-
-        [Column("OnlineBeatmapSetID")]
-        public int? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        public DateTimeOffset DateAdded { get; set; }
-
-        public EFBeatmapMetadata Metadata { get; set; }
-
-        [NotNull]
-        public List<EFBeatmapInfo> Beatmaps { get; } = new List<EFBeatmapInfo>();
-
-        public BeatmapOnlineStatus Status { get; set; } = BeatmapOnlineStatus.None;
-
-        public List<BeatmapSetFileInfo> Files { get; } = new List<BeatmapSetFileInfo>();
-
-        /// <summary>
-        /// The maximum star difficulty of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxStarDifficulty => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.StarRating);
-
-        /// <summary>
-        /// The maximum playable length in milliseconds of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxLength => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.Length);
-
-        /// <summary>
-        /// The maximum BPM of all beatmaps in this set.
-        /// </summary>
-        [JsonIgnore]
-        public double MaxBPM => Beatmaps.Count == 0 ? 0 : Beatmaps.Max(b => b.BPM);
-
-        [NotMapped]
-        public bool DeletePending { get; set; }
-
-        public string Hash { get; set; }
-
-        /// <summary>
-        /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
-        /// The path returned is relative to the user file storage.
-        /// </summary>
-        /// <param name="filename">The name of the file to get the storage path of.</param>
-        public string GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.GetStoragePath();
-
-        public override string ToString() => Metadata?.ToString() ?? base.ToString();
-
-        public bool Protected { get; set; }
-
-        public bool Equals(EFBeatmapSetInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        public bool Equals(IBeatmapSetInfo other) => other is EFBeatmapSetInfo b && Equals(b);
-
-        #region Implementation of IHasOnlineID
-
-        int IHasOnlineID<int>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IBeatmapSetInfo
-
-        IBeatmapMetadataInfo IBeatmapSetInfo.Metadata => Metadata ?? Beatmaps.FirstOrDefault()?.Metadata ?? new EFBeatmapMetadata();
-        IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Rulesets/EFRulesetInfo.cs b/osu.Game/Rulesets/EFRulesetInfo.cs
deleted file mode 100644
index bd67bdb93c..0000000000
--- a/osu.Game/Rulesets/EFRulesetInfo.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Diagnostics.CodeAnalysis;
-using Newtonsoft.Json;
-using osu.Framework.Testing;
-
-namespace osu.Game.Rulesets
-{
-    [ExcludeFromDynamicCompile]
-    [Table(@"RulesetInfo")]
-    public sealed class EFRulesetInfo : IEquatable<EFRulesetInfo>, IComparable<EFRulesetInfo>, IRulesetInfo
-    {
-        public int? ID { get; set; }
-
-        public string Name { get; set; }
-
-        public string ShortName { get; set; }
-
-        public string InstantiationInfo { get; set; }
-
-        [JsonIgnore]
-        public bool Available { get; set; }
-
-        // TODO: this should probably be moved to RulesetStore.
-        public Ruleset CreateInstance()
-        {
-            if (!Available)
-                return null;
-
-            var type = Type.GetType(InstantiationInfo);
-
-            if (type == null)
-                return null;
-
-            var ruleset = Activator.CreateInstance(type) as Ruleset;
-
-            return ruleset;
-        }
-
-        public bool Equals(EFRulesetInfo other) => other != null && ID == other.ID && Available == other.Available && Name == other.Name && InstantiationInfo == other.InstantiationInfo;
-
-        public int CompareTo(EFRulesetInfo other) => OnlineID.CompareTo(other.OnlineID);
-
-        public int CompareTo(IRulesetInfo other)
-        {
-            if (!(other is EFRulesetInfo ruleset))
-                throw new ArgumentException($@"Object is not of type {nameof(EFRulesetInfo)}.", nameof(other));
-
-            return CompareTo(ruleset);
-        }
-
-        public override bool Equals(object obj) => obj is EFRulesetInfo rulesetInfo && Equals(rulesetInfo);
-
-        public bool Equals(IRulesetInfo other) => other is RulesetInfo b && Equals(b);
-
-        [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = ID.HasValue ? ID.GetHashCode() : 0;
-                hashCode = (hashCode * 397) ^ (InstantiationInfo != null ? InstantiationInfo.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ (Name != null ? Name.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ Available.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        public override string ToString() => Name ?? $"{Name} ({ShortName}) ID: {ID}";
-
-        #region Implementation of IHasOnlineID
-
-        [NotMapped]
-        public int OnlineID
-        {
-            get => ID ?? -1;
-            set => ID = value >= 0 ? value : null;
-        }
-
-        #endregion
-    }
-}
diff --git a/osu.Game/Scoring/EFScoreInfo.cs b/osu.Game/Scoring/EFScoreInfo.cs
deleted file mode 100644
index 8a5bbbf0da..0000000000
--- a/osu.Game/Scoring/EFScoreInfo.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using Newtonsoft.Json;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Users;
-using osu.Game.Utils;
-
-namespace osu.Game.Scoring
-{
-    [Table(@"ScoreInfo")]
-    public class EFScoreInfo : IScoreInfo, IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<EFScoreInfo>, IDeepCloneable<EFScoreInfo>
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public ScoreRank Rank { get; set; }
-
-        public long TotalScore { get; set; }
-
-        [Column(TypeName = "DECIMAL(1,4)")] // TODO: This data type is wrong (should contain more precision). But at the same time, we probably don't need to be storing this in the database.
-        public double Accuracy { get; set; }
-
-        public LocalisableString DisplayAccuracy => Accuracy.FormatAccuracy();
-
-        public double? PP { get; set; }
-
-        public int MaxCombo { get; set; }
-
-        public int Combo { get; set; } // Todo: Shouldn't exist in here
-
-        public int RulesetID { get; set; }
-
-        [NotMapped]
-        public bool Passed { get; set; } = true;
-
-        public EFRulesetInfo Ruleset { get; set; }
-
-        private APIMod[] localAPIMods;
-
-        private Mod[] mods;
-
-        [NotMapped]
-        public Mod[] Mods
-        {
-            get
-            {
-                var rulesetInstance = Ruleset?.CreateInstance();
-                if (rulesetInstance == null)
-                    return mods ?? Array.Empty<Mod>();
-
-                Mod[] scoreMods = Array.Empty<Mod>();
-
-                if (mods != null)
-                    scoreMods = mods;
-                else if (localAPIMods != null)
-                    scoreMods = APIMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
-
-                return scoreMods;
-            }
-            set
-            {
-                localAPIMods = null;
-                mods = value;
-            }
-        }
-
-        // Used for API serialisation/deserialisation.
-        [NotMapped]
-        public APIMod[] APIMods
-        {
-            get
-            {
-                if (localAPIMods != null)
-                    return localAPIMods;
-
-                if (mods == null)
-                    return Array.Empty<APIMod>();
-
-                return localAPIMods = mods.Select(m => new APIMod(m)).ToArray();
-            }
-            set
-            {
-                localAPIMods = value;
-
-                // We potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
-                mods = null;
-            }
-        }
-
-        // Used for database serialisation/deserialisation.
-        [Column("Mods")]
-        public string ModsJson
-        {
-            get => JsonConvert.SerializeObject(APIMods);
-            set => APIMods = !string.IsNullOrEmpty(value) ? JsonConvert.DeserializeObject<APIMod[]>(value) : Array.Empty<APIMod>();
-        }
-
-        [NotMapped]
-        public APIUser User { get; set; }
-
-        [Column("User")]
-        public string UserString
-        {
-            get => User?.Username;
-            set
-            {
-                User ??= new APIUser();
-                User.Username = value;
-            }
-        }
-
-        [Column("UserID")]
-        public int? UserID
-        {
-            get => User?.Id ?? 1;
-            set
-            {
-                User ??= new APIUser();
-                User.Id = value ?? 1;
-            }
-        }
-
-        public int BeatmapInfoID { get; set; }
-
-        [Column("Beatmap")]
-        public EFBeatmapInfo BeatmapInfo { get; set; }
-
-        private long? onlineID;
-
-        [JsonProperty("id")]
-        [Column("OnlineScoreID")]
-        public long? OnlineID
-        {
-            get => onlineID;
-            set => onlineID = value > 0 ? value : null;
-        }
-
-        public DateTimeOffset Date { get; set; }
-
-        [NotMapped]
-        public Dictionary<HitResult, int> Statistics { get; set; } = new Dictionary<HitResult, int>();
-
-        [Column("Statistics")]
-        public string StatisticsJson
-        {
-            get => JsonConvert.SerializeObject(Statistics);
-            set
-            {
-                if (value == null)
-                {
-                    Statistics.Clear();
-                    return;
-                }
-
-                Statistics = JsonConvert.DeserializeObject<Dictionary<HitResult, int>>(value);
-            }
-        }
-
-        [NotMapped]
-        public List<HitEvent> HitEvents { get; set; }
-
-        public List<ScoreFileInfo> Files { get; } = new List<ScoreFileInfo>();
-
-        public string Hash { get; set; }
-
-        public bool DeletePending { get; set; }
-
-        /// <summary>
-        /// The position of this score, starting at 1.
-        /// </summary>
-        [NotMapped]
-        public int? Position { get; set; } // TODO: remove after all calls to `CreateScoreInfo` are gone.
-
-        /// <summary>
-        /// Whether this <see cref="EFScoreInfo"/> represents a legacy (osu!stable) score.
-        /// </summary>
-        [NotMapped]
-        public bool IsLegacyScore => Mods.OfType<ModClassic>().Any();
-
-        public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
-        {
-            foreach (var r in Ruleset.CreateInstance().GetHitResults())
-            {
-                int value = Statistics.GetValueOrDefault(r.result);
-
-                switch (r.result)
-                {
-                    case HitResult.SmallTickHit:
-                    {
-                        int total = value + Statistics.GetValueOrDefault(HitResult.SmallTickMiss);
-                        if (total > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
-
-                        break;
-                    }
-
-                    case HitResult.LargeTickHit:
-                    {
-                        int total = value + Statistics.GetValueOrDefault(HitResult.LargeTickMiss);
-                        if (total > 0)
-                            yield return new HitResultDisplayStatistic(r.result, value, total, r.displayName);
-
-                        break;
-                    }
-
-                    case HitResult.SmallTickMiss:
-                    case HitResult.LargeTickMiss:
-                        break;
-
-                    default:
-                        yield return new HitResultDisplayStatistic(r.result, value, null, r.displayName);
-
-                        break;
-                }
-            }
-        }
-
-        public EFScoreInfo DeepClone()
-        {
-            var clone = (EFScoreInfo)MemberwiseClone();
-
-            clone.Statistics = new Dictionary<HitResult, int>(clone.Statistics);
-
-            return clone;
-        }
-
-        public override string ToString() => this.GetDisplayTitle();
-
-        public bool Equals(EFScoreInfo other)
-        {
-            if (ReferenceEquals(this, other)) return true;
-            if (other == null) return false;
-
-            if (ID != 0 && other.ID != 0)
-                return ID == other.ID;
-
-            return false;
-        }
-
-        #region Implementation of IHasOnlineID
-
-        long IHasOnlineID<long>.OnlineID => OnlineID ?? -1;
-
-        #endregion
-
-        #region Implementation of IScoreInfo
-
-        IBeatmapInfo IScoreInfo.Beatmap => BeatmapInfo;
-        IRulesetInfo IScoreInfo.Ruleset => Ruleset;
-        IUser IScoreInfo.User => User;
-        bool IScoreInfo.HasReplay => Files.Any();
-
-        #endregion
-
-        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-    }
-}
diff --git a/osu.Game/Scoring/ScoreFileInfo.cs b/osu.Game/Scoring/ScoreFileInfo.cs
deleted file mode 100644
index 6c3509bccd..0000000000
--- a/osu.Game/Scoring/ScoreFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Scoring
-{
-    public class ScoreFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int ScoreInfoID { get; set; }
-
-        public EFScoreInfo ScoreInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}
diff --git a/osu.Game/Skinning/EFSkinInfo.cs b/osu.Game/Skinning/EFSkinInfo.cs
deleted file mode 100644
index 4204364c50..0000000000
--- a/osu.Game/Skinning/EFSkinInfo.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Game.Database;
-using osu.Game.Extensions;
-using osu.Game.IO;
-
-namespace osu.Game.Skinning
-{
-    [Table(@"SkinInfo")]
-    public class EFSkinInfo : IHasFiles<SkinFileInfo>, IEquatable<EFSkinInfo>, IHasPrimaryKey, ISoftDelete
-    {
-        internal const int DEFAULT_SKIN = 0;
-        internal const int CLASSIC_SKIN = -1;
-        internal const int RANDOM_SKIN = -2;
-
-        public int ID { get; set; }
-
-        public string Name { get; set; } = string.Empty;
-
-        public string Creator { get; set; } = string.Empty;
-
-        public string Hash { get; set; }
-
-        public string InstantiationInfo { get; set; }
-
-        public virtual Skin CreateInstance(IStorageResourceProvider resources)
-        {
-            var type = string.IsNullOrEmpty(InstantiationInfo)
-                // handle the case of skins imported before InstantiationInfo was added.
-                ? typeof(LegacySkin)
-                : Type.GetType(InstantiationInfo).AsNonNull();
-
-            return (Skin)Activator.CreateInstance(type, this, resources);
-        }
-
-        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
-
-        public bool DeletePending { get; set; }
-
-        public static EFSkinInfo Default { get; } = new EFSkinInfo
-        {
-            ID = DEFAULT_SKIN,
-            Name = "osu! (triangles)",
-            Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultSkin).GetInvariantInstantiationInfo()
-        };
-
-        public bool Equals(EFSkinInfo other) => other != null && ID == other.ID;
-
-        public override string ToString()
-        {
-            string author = Creator == null ? string.Empty : $"({Creator})";
-            return $"{Name} {author}".Trim();
-        }
-
-        public bool IsManaged => ID > 0;
-    }
-}
diff --git a/osu.Game/Skinning/SkinFileInfo.cs b/osu.Game/Skinning/SkinFileInfo.cs
deleted file mode 100644
index f3243d3f24..0000000000
--- a/osu.Game/Skinning/SkinFileInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.ComponentModel.DataAnnotations;
-using osu.Game.Database;
-using osu.Game.IO;
-
-namespace osu.Game.Skinning
-{
-    public class SkinFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
-    {
-        public int ID { get; set; }
-
-        public bool IsManaged => ID > 0;
-
-        public int SkinInfoID { get; set; }
-
-        public EFSkinInfo SkinInfo { get; set; }
-
-        public int FileInfoID { get; set; }
-
-        public FileInfo FileInfo { get; set; }
-
-        [Required]
-        public string Filename { get; set; }
-
-        IFileInfo INamedFileUsage.File => FileInfo;
-    }
-}

From 8286ab0d04d7e6fb27cac79b26f2fbc1d161ddb5 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Thu, 15 Sep 2022 11:11:58 +0100
Subject: [PATCH 339/709] Revert "Fix `SongProgress` invalidating too often"

This reverts commit 2b4b14ca9990a4626fefcbecf624ca2d97bf4244.
---
 osu.Game/Screens/Play/HUD/SongProgressInfo.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index b3d5066a9e..d0eb8f8ca1 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -47,10 +47,7 @@ namespace osu.Game.Screens.Play.HUD
             if (clock != null)
                 gameplayClock = clock;
 
-            // Lock height so changes in text autosize (if character height changes)
-            // don't cause parent invalidation.
-            Height = 14;
-
+            AutoSizeAxes = Axes.Y;
             Children = new Drawable[]
             {
                 new Container

From 2092008251cf5d0cc4846763b86719155f59a8bd Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Thu, 15 Sep 2022 11:16:00 +0100
Subject: [PATCH 340/709] Set InvalidationSource to Self

---
 osu.Game/Screens/Play/SquareGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 00d6ede3bf..a1e004bfcc 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize, InvalidationSource.Self);
         private ScheduledDelegate scheduledCreate;
 
         protected override void Update()

From 4af76b9f48fd1d4602319af4552bee120b89f2ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 19:55:18 +0900
Subject: [PATCH 341/709] Apply the same change to `HandleFlip`

---
 .../Edit/OsuSelectionHandler.cs               | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 280a35500a..eddc1390f0 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -127,16 +127,13 @@ namespace osu.Game.Rulesets.Osu.Edit
                 {
                     didFlip = true;
 
-                    var controlPoints = slider.Path.ControlPoints.Select(p =>
-                        new PathControlPoint(new Vector2(
-                            (direction == Direction.Horizontal ? -1 : 1) * p.Position.X,
-                            (direction == Direction.Vertical ? -1 : 1) * p.Position.Y
-                        ), p.Type)).ToArray();
-
-                    // Importantly, update as a single operation so automatic adjustment of control points to different
-                    // curve types does not unexpectedly trigger and change the slider's shape.
-                    slider.Path.ControlPoints.Clear();
-                    slider.Path.ControlPoints.AddRange(controlPoints);
+                    foreach (var cp in slider.Path.ControlPoints)
+                    {
+                        cp.Position = new Vector2(
+                            (direction == Direction.Horizontal ? -1 : 1) * cp.Position.X,
+                            (direction == Direction.Vertical ? -1 : 1) * cp.Position.Y
+                        );
+                    }
                 }
             }
 
@@ -186,8 +183,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 if (h is IHasPath path)
                 {
-                    foreach (PathControlPoint t in path.Path.ControlPoints)
-                        t.Position = RotatePointAroundOrigin(t.Position, Vector2.Zero, delta);
+                    foreach (PathControlPoint cp in path.Path.ControlPoints)
+                        cp.Position = RotatePointAroundOrigin(cp.Position, Vector2.Zero, delta);
                 }
             }
 

From c7f8f948b928c9a240e6fc5f791ad07c7dd26746 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 17:36:14 +0900
Subject: [PATCH 342/709] Rename `CreateLegacySkinProvider` to
 `CreateSkinTransformer` and apply to all skins

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 11 +++++++++-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 11 +++++++++-
 .../TestSceneSliderApplication.cs             |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 11 +++++++++-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 11 +++++++++-
 .../Gameplay/TestSceneBeatmapSkinFallbacks.cs |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  8 +++++++-
 .../Skinning/RulesetSkinProvidingContainer.cs | 20 +++++++++----------
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  2 +-
 9 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 999b9f6e2c..5c9c95827a 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -182,7 +182,16 @@ namespace osu.Game.Rulesets.Catch
 
         public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new CatchDifficultyCalculator(RulesetInfo, beatmap);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new CatchLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new CatchLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public override PerformanceCalculator CreatePerformanceCalculator() => new CatchPerformanceCalculator();
 
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c6a5e8bdaa..061dedb07a 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -62,7 +62,16 @@ namespace osu.Game.Rulesets.Mania
 
         public override HitObjectComposer CreateHitObjectComposer() => new ManiaHitObjectComposer(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new ManiaLegacySkinTransformer(skin, beatmap);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new ManiaLegacySkinTransformer(skin, beatmap);
+            }
+
+            return null;
+        }
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index 08a62fe3ae..0169627867 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 var tintingSkin = skinManager.GetSkin(DefaultLegacySkin.CreateInfo());
                 tintingSkin.Configuration.ConfigDictionary["AllowSliderBallTint"] = "1";
 
-                var provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(tintingSkin, Beatmap.Value.Beatmap);
+                var provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(tintingSkin, Beatmap.Value.Beatmap);
 
                 Child = new SkinProvidingContainer(provider)
                 {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 6af765361d..0a5b3139fc 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -231,7 +231,16 @@ namespace osu.Game.Rulesets.Osu
 
         public override RulesetSettingsSubsection CreateSettings() => new OsuSettingsSubsection(this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new OsuLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new OsuLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public int LegacyID => 0;
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 6beb83575d..dc36bc0320 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -43,7 +43,16 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new TaikoBeatmapConverter(beatmap, this);
 
-        public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TaikoLegacySkinTransformer(skin);
+        public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
+        {
+            switch (skin)
+            {
+                case LegacySkin:
+                    return new TaikoLegacySkinTransformer(skin);
+            }
+
+            return null;
+        }
 
         public const string SHORT_NAME = "taiko";
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index 5c7321fb24..e12be6d3b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestOsuRuleset : OsuRuleset
         {
-            public override ISkin CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
+            public override ISkin CreateSkinTransformer(ISkin skin, IBeatmap beatmap) => new TestOsuLegacySkinTransformer(skin);
 
             private class TestOsuLegacySkinTransformer : OsuLegacySkinTransformer
             {
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 4bc82a5f7e..a446210c8a 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -200,7 +200,13 @@ namespace osu.Game.Rulesets
 
         public ModAutoplay? GetAutoplayMod() => CreateMod<ModAutoplay>();
 
-        public virtual ISkin? CreateLegacySkinProvider(ISkin skin, IBeatmap beatmap) => null;
+        /// <summary>
+        /// Create a transformer which adds lookups specific to a ruleset to skin sources.
+        /// </summary>
+        /// <param name="skin">The source skin.</param>
+        /// <param name="beatmap">The current beatmap.</param>
+        /// <returns>A skin with a transformer applied, or null if no transformation is provided by this ruleset.</returns>
+        public virtual ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap) => null;
 
         protected Ruleset()
         {
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index 937cf20bc6..d5690710bb 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Skinning
             Ruleset = ruleset;
             Beatmap = beatmap;
 
-            InternalChild = new BeatmapSkinProvidingContainer(beatmapSkin is LegacySkin ? GetLegacyRulesetTransformedSkin(beatmapSkin) : beatmapSkin)
+            InternalChild = new BeatmapSkinProvidingContainer(beatmapSkin is LegacySkin ? GetRulesetTransformedSkin(beatmapSkin) : beatmapSkin)
             {
                 Child = Content = new Container
                 {
@@ -67,16 +67,16 @@ namespace osu.Game.Skinning
 
             Debug.Assert(ParentSource != null);
 
-            foreach (var skin in ParentSource.AllSources)
+            foreach (var source in ParentSource.AllSources)
             {
-                switch (skin)
+                switch (source)
                 {
-                    case LegacySkin legacySkin:
-                        sources.Add(GetLegacyRulesetTransformedSkin(legacySkin));
+                    case Skin skin:
+                        sources.Add(GetRulesetTransformedSkin(skin));
                         break;
 
                     default:
-                        sources.Add(skin);
+                        sources.Add(source);
                         break;
                 }
             }
@@ -94,16 +94,16 @@ namespace osu.Game.Skinning
             SetSources(sources);
         }
 
-        protected ISkin GetLegacyRulesetTransformedSkin(ISkin legacySkin)
+        protected ISkin GetRulesetTransformedSkin(ISkin skin)
         {
-            if (legacySkin == null)
+            if (skin == null)
                 return null;
 
-            var rulesetTransformed = Ruleset.CreateLegacySkinProvider(legacySkin, Beatmap);
+            var rulesetTransformed = Ruleset.CreateSkinTransformer(skin, Beatmap);
             if (rulesetTransformed != null)
                 return rulesetTransformed;
 
-            return legacySkin;
+            return skin;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index ffdde782a5..7278e1e93f 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual
             ISkin provider = skin;
 
             if (provider is LegacySkin legacyProvider)
-                provider = Ruleset.Value.CreateInstance().CreateLegacySkinProvider(legacyProvider, beatmap);
+                provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(legacyProvider, beatmap);
 
             var children = new Container
             {

From 5ce67345ae129f4d0fd80ca15bbb7130af15f8b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 01:02:38 +0900
Subject: [PATCH 343/709] Catch against sqlite initialisation failures

---
 osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
index 007bec46bb..2fd1d06b7b 100644
--- a/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
+++ b/osu.Game/Beatmaps/BeatmapUpdaterMetadataLookup.cs
@@ -42,9 +42,16 @@ namespace osu.Game.Beatmaps
 
         public BeatmapUpdaterMetadataLookup(IAPIProvider api, Storage storage)
         {
-            // required to initialise native SQLite libraries on some platforms.
-            Batteries_V2.Init();
-            raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+            try
+            {
+                // required to initialise native SQLite libraries on some platforms.
+                Batteries_V2.Init();
+                raw.sqlite3_config(2 /*SQLITE_CONFIG_MULTITHREAD*/);
+            }
+            catch
+            {
+                // may fail if platform not supported.
+            }
 
             this.api = api;
             this.storage = storage;

From db822696eda362206817b1881c17e7613f79f4d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 01:02:46 +0900
Subject: [PATCH 344/709] Use latest version of sqlite3 bundle

---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 953087f9c8..fed7c27f07 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>

From 4f208416bedfd8cb3cd11474d7de2dca5aa40c8d Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Fri, 16 Sep 2022 13:50:18 +1400
Subject: [PATCH 345/709] Fixed irresponsiveness of score panel timestamp to
 time format

---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index b496f4242d..e212dad65f 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -7,12 +7,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -34,6 +36,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
+        private Bindable<bool> bindableUse24HourDisplay;
         private readonly bool withFlair;
 
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
@@ -61,8 +64,9 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache beatmapDifficultyCache)
+        private void load(BeatmapDifficultyCache beatmapDifficultyCache, OsuConfigManager config)
         {
+            bindableUse24HourDisplay = config.GetBindable<bool>(OsuSetting.Prefer24HourTime);
             var beatmap = score.BeatmapInfo;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             string creator = metadata.Author.Username;
@@ -224,7 +228,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             });
 
             if (score.Date != default)
-                AddInternal(new PlayedOnText(score.Date));
+                AddInternal(new PlayedOnText(score.Date, bindableUse24HourDisplay));
 
             var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
 
@@ -280,12 +284,25 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         public class PlayedOnText : OsuSpriteText
         {
-            public PlayedOnText(DateTimeOffset time)
+            private bool use24HourDisplay;
+
+            public PlayedOnText(DateTimeOffset time, Bindable<bool> bindableUse24HourDisplay)
             {
+                use24HourDisplay = bindableUse24HourDisplay.Value;
+                bindableUse24HourDisplay.BindValueChanged(prefer24H =>
+                {
+                    use24HourDisplay = prefer24H.NewValue;
+                    UpdateHourDisplay(time);
+                }, true);
                 Anchor = Anchor.BottomCentre;
                 Origin = Anchor.BottomCentre;
                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold);
-                Text = $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}";
+                UpdateHourDisplay(time);
+            }
+
+            public void UpdateHourDisplay(DateTimeOffset time)
+            {
+                Text = use24HourDisplay ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
             }
         }
     }

From d9499abc3387367b4922abda985c2ee90ff76c07 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 16 Sep 2022 13:14:25 +0900
Subject: [PATCH 346/709] Refactor to avoid passing around bindables

---
 .../Expanded/ExpandedPanelMiddleContent.cs    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index e212dad65f..829ba83696 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         private const float padding = 10;
 
         private readonly ScoreInfo score;
-        private Bindable<bool> bindableUse24HourDisplay;
         private readonly bool withFlair;
 
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
@@ -64,9 +63,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache beatmapDifficultyCache, OsuConfigManager config)
+        private void load(BeatmapDifficultyCache beatmapDifficultyCache)
         {
-            bindableUse24HourDisplay = config.GetBindable<bool>(OsuSetting.Prefer24HourTime);
             var beatmap = score.BeatmapInfo;
             var metadata = beatmap.BeatmapSet?.Metadata ?? beatmap.Metadata;
             string creator = metadata.Author.Username;
@@ -228,7 +226,7 @@ namespace osu.Game.Screens.Ranking.Expanded
             });
 
             if (score.Date != default)
-                AddInternal(new PlayedOnText(score.Date, bindableUse24HourDisplay));
+                AddInternal(new PlayedOnText(score.Date));
 
             var starDifficulty = beatmapDifficultyCache.GetDifficultyAsync(beatmap, score.Ruleset, score.Mods).GetResultSafely();
 
@@ -284,25 +282,34 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         public class PlayedOnText : OsuSpriteText
         {
-            private bool use24HourDisplay;
+            private readonly DateTimeOffset time;
+            private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
 
-            public PlayedOnText(DateTimeOffset time, Bindable<bool> bindableUse24HourDisplay)
+            public PlayedOnText(DateTimeOffset time)
             {
-                use24HourDisplay = bindableUse24HourDisplay.Value;
-                bindableUse24HourDisplay.BindValueChanged(prefer24H =>
-                {
-                    use24HourDisplay = prefer24H.NewValue;
-                    UpdateHourDisplay(time);
-                }, true);
+                this.time = time;
+
                 Anchor = Anchor.BottomCentre;
                 Origin = Anchor.BottomCentre;
                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold);
-                UpdateHourDisplay(time);
             }
 
-            public void UpdateHourDisplay(DateTimeOffset time)
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager configManager)
             {
-                Text = use24HourDisplay ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
+                configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                prefer24HourTime.BindValueChanged(_ => updateDisplay(), true);
+            }
+
+            private void updateDisplay()
+            {
+                Text = prefer24HourTime.Value ? $"Played on {time.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {time.ToLocalTime():d MMMM yyyy h:mm tt}";
             }
         }
     }

From 21ac3fd88be99c7b057e420b2d3d75dd5b592dff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 14:00:05 +0900
Subject: [PATCH 347/709] Catch any unobserved exceptions during beatmap
 metadata harvesting

The process will retry when a connection is successful, so this doesn't
need to be as loud as it was.

Addresses https://github.com/ppy/osu/discussions/20331.
---
 osu.Game/Online/Metadata/OnlineMetadataClient.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Metadata/OnlineMetadataClient.cs b/osu.Game/Online/Metadata/OnlineMetadataClient.cs
index 95228c380f..06d24a82f3 100644
--- a/osu.Game/Online/Metadata/OnlineMetadataClient.cs
+++ b/osu.Game/Online/Metadata/OnlineMetadataClient.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.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -80,6 +81,10 @@ namespace osu.Game.Online.Metadata
                             await ProcessChanges(catchUpChanges.BeatmapSetIDs);
                         }
                     }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"Error while processing catch-up of metadata ({e.Message})");
+                    }
                     finally
                     {
                         catchingUp = false;

From 289e6ad977f6e073ca61e20aafe961b3c0e479f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 15:12:05 +0900
Subject: [PATCH 348/709] Fix follow point animations in legacy skins not
 always starting at correct point in time

---
 .../Connections/FollowPointConnection.cs      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 0306c99fd5..1a9d12e860 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -1,9 +1,8 @@
 // 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.
 
-#nullable disable
-
 using System;
+using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Objects;
@@ -21,32 +20,36 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         public const int SPACING = 32;
         public const double PREEMPT = 800;
 
-        public DrawablePool<FollowPoint> Pool;
+        public DrawablePool<FollowPoint>? Pool { private get; set; }
 
         protected override void OnApply(FollowPointLifetimeEntry entry)
         {
             base.OnApply(entry);
 
-            entry.Invalidated += onEntryInvalidated;
-            refreshPoints();
+            entry.Invalidated += scheduleRefresh;
+
+            // Our clock may not be correct at this point if `LoadComplete` has not run yet.
+            // Without a schedule, animations referencing FollowPoint's clock (see `IAnimationTimeReference`) would be incorrect on first pool usage.
+            scheduleRefresh();
         }
 
         protected override void OnFree(FollowPointLifetimeEntry entry)
         {
             base.OnFree(entry);
 
-            entry.Invalidated -= onEntryInvalidated;
+            entry.Invalidated -= scheduleRefresh;
             // Return points to the pool.
             ClearInternal(false);
         }
 
-        private void onEntryInvalidated() => Scheduler.AddOnce(refreshPoints);
-
-        private void refreshPoints()
+        private void scheduleRefresh() => Scheduler.AddOnce(() =>
         {
+            Debug.Assert(Pool != null);
+
             ClearInternal(false);
 
             var entry = Entry;
+
             if (entry?.End == null) return;
 
             OsuHitObject start = entry.Start;
@@ -95,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             }
 
             entry.LifetimeEnd = finalTransformEndTime;
-        }
+        });
 
         /// <summary>
         /// Computes the fade time of follow point positioned between two hitobjects.

From 0ff4e343f87c82b04692584c0e61c1ef26ba56d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 16:29:53 +0900
Subject: [PATCH 349/709] Add failing test showing incorrect unread
 notification count

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index e978b57ba4..a97096e143 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 displayedCount = new OsuSpriteText()
             };
 
-            notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count.NewValue}"; };
+            notificationOverlay.UnreadCount.ValueChanged += count => { displayedCount.Text = $"unread count: {count.NewValue}"; };
         });
 
         [Test]
@@ -270,6 +270,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait completion", () => notification.State == ProgressNotificationState.Completed);
 
             AddAssert("Completion toast shown", () => notificationOverlay.ToastCount == 1);
+            AddUntilStep("wait forwarded", () => notificationOverlay.ToastCount == 0);
+            AddAssert("only one unread", () => notificationOverlay.UnreadCount.Value == 1);
         }
 
         [Test]

From 0d24fda4b9cbaaa107717feab3fc9adc4635cdd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 16:36:56 +0900
Subject: [PATCH 350/709] Fire `Notification.Closed` immediately to ensure
 off-screen notifications are closed

---
 osu.Game/Overlays/NotificationOverlay.cs      |  4 ++--
 .../Overlays/Notifications/Notification.cs    | 23 +++++++++++--------
 .../Notifications/ProgressNotification.cs     |  5 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 15573f99af..fad8afd371 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -210,14 +210,14 @@ namespace osu.Game.Overlays
             mainContent.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
         }
 
-        private void notificationClosed()
+        private void notificationClosed() => Schedule(() =>
         {
             updateCounts();
 
             // this debounce is currently shared between popin/popout sounds, which means one could potentially not play when the user is expecting it.
             // popout is constant across all notification types, and should therefore be handled using playback concurrency instead, but seems broken at the moment.
             playDebouncedSample("UI/overlay-pop-out");
-        }
+        });
 
         private void playDebouncedSample(string sampleName)
         {
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 885bb2fc6c..4e7cebf0ae 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Overlays.Notifications
     public abstract class Notification : Container
     {
         /// <summary>
-        /// User requested close.
+        /// Notification was closed, either by user or otherwise.
+        /// Importantly, this event may be fired from a non-update thread.
         /// </summary>
         public event Action? Closed;
 
@@ -55,6 +56,8 @@ namespace osu.Game.Overlays.Notifications
 
         protected Container IconContent;
 
+        public bool WasClosed { get; private set; }
+
         private readonly Container content;
 
         protected override Container<Drawable> Content => content;
@@ -245,21 +248,23 @@ namespace osu.Game.Overlays.Notifications
             initialFlash.FadeOutFromOne(2000, Easing.OutQuart);
         }
 
-        public bool WasClosed;
-
         public virtual void Close(bool runFlingAnimation)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
-            if (runFlingAnimation && dragContainer.FlingLeft())
-                this.FadeOut(600, Easing.In);
-            else
-                this.FadeOut(100);
-
             Closed?.Invoke();
-            Expire();
+
+            Schedule(() =>
+            {
+                if (runFlingAnimation && dragContainer.FlingLeft())
+                    this.FadeOut(600, Easing.In);
+                else
+                    this.FadeOut(100);
+
+                Expire();
+            });
         }
 
         private class DragContainer : Container
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index c4d402e5b9..58c9814781 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Overlays.Notifications
 
                 case ProgressNotificationState.Completed:
                     loadingSpinner.Hide();
-                    attemptPostCompletion();
-                    base.Close(false);
                     break;
             }
         }
@@ -166,6 +164,8 @@ namespace osu.Game.Overlays.Notifications
 
             CompletionTarget.Invoke(CreateCompletionNotification());
             completionSent = true;
+
+            Close(false);
         }
 
         private ProgressNotificationState state;
@@ -239,6 +239,7 @@ namespace osu.Game.Overlays.Notifications
         {
             switch (State)
             {
+                case ProgressNotificationState.Completed:
                 case ProgressNotificationState.Cancelled:
                     base.Close(runFlingAnimation);
                     break;

From 38d8d457d97a43d64deb14cec6f6e8b11b493d53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 17:54:44 +0900
Subject: [PATCH 351/709] Add back second completion post attempt for case when
 notification overlay isn't loaded yet

---
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 58c9814781..61bb22041e 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Overlays.Notifications
 
                 case ProgressNotificationState.Completed:
                     loadingSpinner.Hide();
+                    attemptPostCompletion();
                     break;
             }
         }

From 4c4fdfd15379afe3906b69512b367e8bf1b403c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 18:15:17 +0900
Subject: [PATCH 352/709] Provide scores directly to `Player` instance rather
 than relying on DI

---
 .../TestSceneSoloGameplayLeaderboard.cs         |  6 ++----
 .../Leaderboards/ILeaderboardScoreSource.cs     | 15 ---------------
 .../Screens/Play/HUD/SoloGameplayLeaderboard.cs | 16 ++++++----------
 osu.Game/Screens/Play/Player.cs                 |  7 ++++++-
 .../Select/Leaderboards/BeatmapLeaderboard.cs   |  2 +-
 osu.Game/Screens/Select/PlaySongSelect.cs       | 17 +++++++++--------
 6 files changed, 24 insertions(+), 39 deletions(-)
 delete mode 100644 osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 6839fafa93..2b8eb3a80c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -18,7 +17,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSoloGameplayLeaderboard : OsuTestScene, ILeaderboardScoreSource
+    public class TestSceneSoloGameplayLeaderboard : OsuTestScene
     {
         [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor(new OsuRuleset());
@@ -40,6 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 Child = new SoloGameplayLeaderboard(trackingUser)
                 {
+                    Scores = { BindTarget = scores },
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Expanded = { Value = true },
@@ -57,8 +57,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.Combo.Value = v);
         }
 
-        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores => scores;
-
         private static List<ScoreInfo> createSampleScores()
         {
             return new[]
diff --git a/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs b/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs
deleted file mode 100644
index e7ed43633e..0000000000
--- a/osu.Game/Online/Leaderboards/ILeaderboardScoreSource.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Scoring;
-
-namespace osu.Game.Online.Leaderboards
-{
-    [Cached]
-    public interface ILeaderboardScoreSource
-    {
-        IBindableList<ScoreInfo> Scores { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 6141260beb..00efcb1ea9 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
@@ -16,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly IUser trackingUser;
 
-        private readonly IBindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
+        public readonly IBindableList<ScoreInfo> Scores = new BindableList<ScoreInfo>();
 
         // hold references to ensure bindables are updated.
         private readonly List<Bindable<long>> scoreBindables = new List<Bindable<long>>();
@@ -32,13 +31,10 @@ namespace osu.Game.Screens.Play.HUD
             this.trackingUser = trackingUser;
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(ILeaderboardScoreSource? scoreSource)
+        protected override void LoadComplete()
         {
-            if (scoreSource != null)
-                scores.BindTo(scoreSource.Scores);
-
-            scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
+            base.LoadComplete();
+            Scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
         }
 
         private void showScores()
@@ -46,7 +42,7 @@ namespace osu.Game.Screens.Play.HUD
             Clear();
             scoreBindables.Clear();
 
-            if (!scores.Any())
+            if (!Scores.Any())
                 return;
 
             ILeaderboardScore local = Add(trackingUser, true);
@@ -58,7 +54,7 @@ namespace osu.Game.Screens.Play.HUD
             // Local score should always show lower than any existing scores in cases of ties.
             local.DisplayOrder.Value = long.MaxValue;
 
-            foreach (var s in scores)
+            foreach (var s in Scores)
             {
                 var score = Add(s.User, false);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 95e3e75c8a..e1530d7ea2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -843,7 +843,12 @@ namespace osu.Game.Screens.Play
             });
         }
 
-        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User);
+        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+
+        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+        {
+            Scores = { BindTarget = LeaderboardScores }
+        };
 
         protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.LeaderboardFlow.Add(leaderboard);
 
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index ee62160a21..ed4da5e848 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -23,7 +23,7 @@ using Realms;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
-    public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>, ILeaderboardScoreSource
+    public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>
     {
         public Action<ScoreInfo> ScoreSelected;
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 619ec97535..068f78172b 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
-using osu.Game.Online.Leaderboards;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
@@ -22,7 +21,7 @@ using osuTK.Input;
 
 namespace osu.Game.Screens.Select
 {
-    public class PlaySongSelect : SongSelect, ILeaderboardScoreSource
+    public class PlaySongSelect : SongSelect
     {
         private OsuScreen? playerLoader;
 
@@ -111,14 +110,18 @@ namespace osu.Game.Screens.Select
 
             Player createPlayer()
             {
+                Player player;
+
                 var replayGeneratingMod = Mods.Value.OfType<ICreateReplayData>().FirstOrDefault();
 
                 if (replayGeneratingMod != null)
-                {
-                    return new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods));
-                }
+                    player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods));
+                else
+                    player = new SoloPlayer();
 
-                return new SoloPlayer();
+                ((IBindableList<ScoreInfo>)player.LeaderboardScores).BindTo(playBeatmapDetailArea.Leaderboard.Scores);
+
+                return player;
             }
         }
 
@@ -132,7 +135,5 @@ namespace osu.Game.Screens.Select
                 playerLoader = null;
             }
         }
-
-        IBindableList<ScoreInfo> ILeaderboardScoreSource.Scores => playBeatmapDetailArea.Leaderboard.Scores;
     }
 }

From c0e2ba419e60bf72affedb4dcb5a8d0cc7f73424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= <azusa@binary0.jp>
Date: Fri, 16 Sep 2022 18:31:02 +0900
Subject: [PATCH 353/709] Localize non-localizable setting items

---
 osu.Game/Localisation/DebugSettingsStrings.cs |  10 ++
 .../Localisation/GeneralSettingsStrings.cs    |   5 +
 .../MaintenanceSettingsStrings.cs             | 111 ++++++++++++++++++
 .../Localisation/TabletSettingsStrings.cs     |   5 +
 .../Sections/DebugSettings/MemorySettings.cs  |   4 +-
 .../Sections/General/UpdateSettings.cs        |   2 +-
 .../Settings/Sections/Input/TabletSettings.cs |   7 +-
 .../Sections/Maintenance/BeatmapSettings.cs   |   2 +-
 .../Maintenance/CollectionsSettings.cs        |   4 +-
 .../MassDeleteConfirmationDialog.cs           |   3 +-
 .../MassVideoDeleteConfirmationDialog.cs      |   3 +-
 .../Maintenance/MigrationRunScreen.cs         |   9 +-
 .../Maintenance/MigrationSelectScreen.cs      |   7 +-
 .../Sections/Maintenance/ModPresetSettings.cs |   6 +-
 .../Sections/Maintenance/ScoreSettings.cs     |   2 +-
 .../Sections/Maintenance/SkinSettings.cs      |   2 +-
 .../StableDirectoryLocationDialog.cs          |   5 +-
 .../StableDirectorySelectScreen.cs            |   3 +-
 18 files changed, 163 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Localisation/DebugSettingsStrings.cs b/osu.Game/Localisation/DebugSettingsStrings.cs
index 74b2c8d892..66ce0fa109 100644
--- a/osu.Game/Localisation/DebugSettingsStrings.cs
+++ b/osu.Game/Localisation/DebugSettingsStrings.cs
@@ -49,6 +49,16 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString CompactRealm => new TranslatableString(getKey(@"compact_realm"), @"Compact realm");
 
+        /// <summary>
+        /// "Block realm"
+        /// </summary>
+        public static LocalisableString BlockRealm => new TranslatableString(getKey(@"block_realm"), @"Block realm");
+
+        /// <summary>
+        /// "Unblock realm"
+        /// </summary>
+        public static LocalisableString UnblockRealm => new TranslatableString(getKey(@"unblock_realm"), @"Unblock realm");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index 2aa91f5245..bbad80976e 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -64,6 +64,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RunSetupWizard => new TranslatableString(getKey(@"run_setup_wizard"), @"Run setup wizard");
 
+        /// <summary>
+		/// "You are running the latest release ({0})"
+		/// </summary>
+		public static LocalisableString RunningLatestRelease(string arg0) => new TranslatableString(getKey(@"running_latest_release"), @"You are running the latest release ({0})", arg0);
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/MaintenanceSettingsStrings.cs b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
index a398eced07..8b7ca8d93a 100644
--- a/osu.Game/Localisation/MaintenanceSettingsStrings.cs
+++ b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
@@ -14,11 +14,72 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString MaintenanceSectionHeader => new TranslatableString(getKey(@"maintenance_section_header"), @"Maintenance");
 
+        /// <summary>
+        /// "Beatmaps"
+        /// </summary>
+        public static LocalisableString Beatmaps => new TranslatableString(getKey(@"beatmaps"), @"Beatmaps");
+
+        /// <summary>
+        /// "Skins"
+        /// </summary>
+        public static LocalisableString Skins => new TranslatableString(getKey(@"skins"), @"Skins");
+
+        /// <summary>
+        /// "Collections"
+        /// </summary>
+        public static LocalisableString Collections => new TranslatableString(getKey(@"collections"), @"Collections");
+
+
+        /// <summary>
+        /// "Scores"
+        /// </summary>
+        public static LocalisableString Scores => new TranslatableString(getKey(@"scores"), @"Scores");
+
+        /// <summary>
+        /// "Mod presets"
+        /// </summary>
+        public static LocalisableString ModPresets => new TranslatableString(getKey(@"mod_presets"), @"Mod presets");
+
         /// <summary>
         /// "Select directory"
         /// </summary>
         public static LocalisableString SelectDirectory => new TranslatableString(getKey(@"select_directory"), @"Select directory");
 
+        /// <summary>
+        /// "Migration in progress"
+        /// </summary>
+        public static LocalisableString MigrationInProgress => new TranslatableString(getKey(@"migration_in_progress"), @"Migration in progress");
+
+        /// <summary>
+        /// "This could take a few minutes depending on the speed of your disk(s)."
+        /// </summary>
+        public static LocalisableString MigrationDescription => new TranslatableString(getKey(@"migration_description"), @"This could take a few minutes depending on the speed of your disk(s).");
+
+        /// <summary>
+        /// "Please avoid interacting with the game!"
+        /// </summary>
+        public static LocalisableString ProhibitedInteractDuringMigration => new TranslatableString(getKey(@"prohibited_interact_during_migration"), @"Please avoid interacting with the game!");
+
+        /// <summary>
+        /// "Some files couldn't be cleaned up during migration. Clicking this notification will open the folder so you can manually clean things up."
+        /// </summary>
+        public static LocalisableString FailedCleanupNotification => new TranslatableString(getKey(@"failed_cleanup_notification"), @"Some files couldn't be cleaned up during migration. Clicking this notification will open the folder so you can manually clean things up.");
+
+        /// <summary>
+        /// "Please select a new location"
+        /// </summary>
+        public static LocalisableString SelectNewLocation => new TranslatableString(getKey(@"select_new_location"), @"Please select a new location");
+
+        /// <summary>
+        /// "The target directory already seems to have an osu! install. Use that data instead?"
+        /// </summary>
+        public static LocalisableString TargetDirectoryAlreadyInstalledOsu => new TranslatableString(getKey(@"target_directory_already_installed_osu"), @"The target directory already seems to have an osu! install. Use that data instead?");
+
+        /// <summary>
+        /// "To complete this operation, osu! will close. Please open it again to use the new data location."
+        /// </summary>
+        public static LocalisableString RestartAndReOpenRequiredForCompletion => new TranslatableString(getKey(@"restart_and_re_open_required_for_completion"), @"To complete this operation, osu! will close. Please open it again to use the new data location.");
+
         /// <summary>
         /// "Import beatmaps from stable"
         /// </summary>
@@ -84,6 +145,56 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RestoreAllRecentlyDeletedModPresets => new TranslatableString(getKey(@"restore_all_recently_deleted_mod_presets"), @"Restore all recently deleted mod presets");
 
+        /// <summary>
+        /// "Deleted all collections!"
+        /// </summary>
+        public static LocalisableString DeletedAllCollections => new TranslatableString(getKey(@"deleted_all_collections"), @"Deleted all collections!");
+
+        /// <summary>
+        /// "Deleted all mod presets!"
+        /// </summary>
+        public static LocalisableString DeletedAllModPresets => new TranslatableString(getKey(@"deleted_all_mod_presets"), @"Deleted all mod presets!");
+
+        /// <summary>
+        /// "Restored all deleted mod presets!"
+        /// </summary>
+        public static LocalisableString RestoredAllDeletedModPresets => new TranslatableString(getKey(@"restored_all_deleted_mod_presets"), @"Restored all deleted mod presets!");
+
+        /// <summary>
+        /// "Everything?"
+        /// </summary>
+        public static LocalisableString MassDeleteConfirmation => new TranslatableString(getKey(@"mass_delete_confirmation"), @"Everything?");
+
+        /// <summary>
+        /// "All beatmap videos? This cannot be undone!"
+        /// </summary>
+        public static LocalisableString MassVideoDeleteConfirmation => new TranslatableString(getKey(@"mass_video_delete_confirmation"), @"All beatmap videos? This cannot be undone!");
+
+        /// <summary>
+        /// "Failed to automatically locate an osu!stable installation."
+        /// </summary>
+        public static LocalisableString StableDirectoryLocationHeader => new TranslatableString(getKey(@"stable_directory_location_header"), @"Failed to automatically locate an osu!stable installation.");
+
+        /// <summary>
+        /// "An existing install could not be located. If you know where it is, you can help locate it."
+        /// </summary>
+        public static LocalisableString StableDirectoryLocationBody => new TranslatableString(getKey(@"stable_directory_location_body"), @"An existing install could not be located. If you know where it is, you can help locate it.");
+
+        /// <summary>
+        /// "Sure! I know where it is located!"
+        /// </summary>
+        public static LocalisableString StableDirectoryLocationOk => new TranslatableString(getKey(@"stable_directory_location_ok"), @"Sure! I know where it is located!");
+
+        /// <summary>
+        /// "Actually I don't have osu!stable installed."
+        /// </summary>
+        public static LocalisableString StableDirectoryLocationCancel => new TranslatableString(getKey(@"stable_directory_location_cancel"), @"Actually I don't have osu!stable installed.");
+
+        /// <summary>
+        /// "Please select your osu!stable install location"
+        /// </summary>
+        public static LocalisableString StableDirectorySelectHeader => new TranslatableString(getKey(@"stable_directory_select_header"), @"Please select your osu!stable install location");
+
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/TabletSettingsStrings.cs b/osu.Game/Localisation/TabletSettingsStrings.cs
index d62d348df9..6c2e3c1f9c 100644
--- a/osu.Game/Localisation/TabletSettingsStrings.cs
+++ b/osu.Game/Localisation/TabletSettingsStrings.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString NoTabletDetected => new TranslatableString(getKey(@"no_tablet_detected"), @"No tablet detected!");
 
+        /// <summary>
+        /// "If your tablet is not detected, please read [this FAQ]({0}) for troubleshooting steps."
+        /// </summary>
+        public static LocalisableString NoTabletDetectedDescription(string url) => new TranslatableString(getKey(@"no_tablet_detected_description"), @"If your tablet is not detected, please read [this FAQ]({0}) for troubleshooting steps.", url);
+
         /// <summary>
         /// "Reset to full area"
         /// </summary>
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
index 42ac4adb34..5ec09adfda 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
                 },
                 blockAction = new SettingsButton
                 {
-                    Text = "Block realm",
+                    Text = DebugSettingsStrings.BlockRealm,
                 },
                 unblockAction = new SettingsButton
                 {
-                    Text = "Unblock realm",
+                    Text = DebugSettingsStrings.UnblockRealm,
                 },
             };
 
diff --git a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
index b68a4fed48..d97cf699e5 100644
--- a/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                             {
                                 notifications?.Post(new SimpleNotification
                                 {
-                                    Text = $"You are running the latest release ({game.Version})",
+                                    Text = GeneralSettingsStrings.RunningLatestRelease(game.Version),
                                     Icon = FontAwesome.Solid.CheckCircle,
                                 });
                             }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 271438ed14..43676c5bbe 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -110,11 +110,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows || RuntimeInfo.OS == RuntimeInfo.Platform.Linux)
                             {
                                 t.NewLine();
-                                t.AddText("If your tablet is not detected, please read ");
-                                t.AddLink("this FAQ", LinkAction.External, RuntimeInfo.OS == RuntimeInfo.Platform.Windows
+                                var formattedSource = MessageFormatter.FormatText(TabletSettingsStrings.NoTabletDetectedDescription(RuntimeInfo.OS == RuntimeInfo.Platform.Windows
                                     ? @"https://opentabletdriver.net/Wiki/FAQ/Windows"
-                                    : @"https://opentabletdriver.net/Wiki/FAQ/Linux");
-                                t.AddText(" for troubleshooting steps.");
+                                    : @"https://opentabletdriver.net/Wiki/FAQ/Linux").ToString());
+                                t.AddLinks(formattedSource.Text, formattedSource.Links);
                             }
                         }),
                     }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
index 453dbd2e18..00342faf3b 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class BeatmapSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "Beatmaps";
+        protected override LocalisableString Header => MaintenanceSettingsStrings.Beatmaps;
 
         private SettingsButton importBeatmapsButton = null!;
         private SettingsButton deleteBeatmapsButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
index 5a91213eb8..9ec6f59fb5 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class CollectionsSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "Collections";
+        protected override LocalisableString Header => MaintenanceSettingsStrings.Collections;
 
         private SettingsButton importCollectionsButton = null!;
 
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private void deleteAllCollections()
         {
             realm.Write(r => r.RemoveAll<BeatmapCollection>());
-            notificationOverlay?.Post(new ProgressCompletionNotification { Text = "Deleted all collections!" });
+            notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.DeletedAllCollections });
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
index 19e6f83dac..bcfccaa5e2 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
@@ -10,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         public MassDeleteConfirmationDialog(Action deleteAction)
         {
-            BodyText = "Everything?";
+            BodyText = MaintenanceSettingsStrings.MassDeleteConfirmation;
             DeleteAction = deleteAction;
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
index fc8c9d497b..a386c64806 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -10,7 +11,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         public MassVideoDeleteConfirmationDialog(Action deleteAction)
             : base(deleteAction)
         {
-            BodyText = "All beatmap videos? This cannot be undone!";
+            BodyText = MaintenanceSettingsStrings.MassVideoDeleteConfirmation;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
index d565576d09..158e1a8aa0 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationRunScreen.cs
@@ -15,6 +15,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens;
 using osuTK;
@@ -71,14 +72,14 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Text = "Migration in progress",
+                            Text = MaintenanceSettingsStrings.MigrationInProgress,
                             Font = OsuFont.Default.With(size: 40)
                         },
                         new OsuSpriteText
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Text = "This could take a few minutes depending on the speed of your disk(s).",
+                            Text = MaintenanceSettingsStrings.MigrationDescription,
                             Font = OsuFont.Default.With(size: 30)
                         },
                         new LoadingSpinner(true)
@@ -89,7 +90,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Text = "Please avoid interacting with the game!",
+                            Text = MaintenanceSettingsStrings.ProhibitedInteractDuringMigration,
                             Font = OsuFont.Default.With(size: 30)
                         },
                     }
@@ -111,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                     {
                                         notifications.Post(new SimpleNotification
                                         {
-                                            Text = "Some files couldn't be cleaned up during migration. Clicking this notification will open the folder so you can manually clean things up.",
+                                            Text = MaintenanceSettingsStrings.FailedCleanupNotification,
                                             Activated = () =>
                                             {
                                                 originalStorage.PresentExternally();
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 0d32e33d87..2f4f04fbc2 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.IO;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
@@ -35,7 +36,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public override bool HideOverlaysOnEnter => true;
 
-        public override LocalisableString HeaderText => "Please select a new location";
+        public override LocalisableString HeaderText => MaintenanceSettingsStrings.SelectNewLocation;
 
         protected override void OnSelection(DirectoryInfo directory)
         {
@@ -51,9 +52,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     // Quick test for whether there's already an osu! install at the target path.
                     if (fileInfos.Any(f => f.Name == OsuGameBase.CLIENT_DATABASE_FILENAME))
                     {
-                        dialogOverlay.Push(new ConfirmDialog("The target directory already seems to have an osu! install. Use that data instead?", () =>
+                        dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.TargetDirectoryAlreadyInstalledOsu.ToString(), () =>
                             {
-                                dialogOverlay.Push(new ConfirmDialog("To complete this operation, osu! will close. Please open it again to use the new data location.", () =>
+                                dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.RestartAndReOpenRequiredForCompletion.ToString(), () =>
                                 {
                                     (storage as OsuStorage)?.ChangeDataPath(target.FullName);
                                     game.Exit();
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
index d35d3ff468..3e3138f041 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class ModPresetSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "Mod presets";
+        protected override LocalisableString Header => MaintenanceSettingsStrings.ModPresets;
 
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
@@ -64,7 +64,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             deleteAllButton.Enabled.Value = true;
 
             if (deletionTask.IsCompletedSuccessfully)
-                notificationOverlay?.Post(new ProgressCompletionNotification { Text = "Deleted all mod presets!" });
+                notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.DeletedAllModPresets });
             else if (deletionTask.IsFaulted)
                 Logger.Error(deletionTask.Exception, "Failed to delete all mod presets");
         }
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             undeleteButton.Enabled.Value = true;
 
             if (undeletionTask.IsCompletedSuccessfully)
-                notificationOverlay?.Post(new ProgressCompletionNotification { Text = "Restored all deleted mod presets!" });
+                notificationOverlay?.Post(new ProgressCompletionNotification { Text = MaintenanceSettingsStrings.RestoredAllDeletedModPresets });
             else if (undeletionTask.IsFaulted)
                 Logger.Error(undeletionTask.Exception, "Failed to restore mod presets");
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
index 70e11d45dc..6377d59e2a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class ScoreSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "Scores";
+        protected override LocalisableString Header => MaintenanceSettingsStrings.Scores;
 
         private SettingsButton importScoresButton = null!;
         private SettingsButton deleteScoresButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
index c95b1d4dd8..893981f3d9 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class SkinSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => "Skins";
+        protected override LocalisableString Header => MaintenanceSettingsStrings.Skins;
 
         private SettingsButton importSkinsButton = null!;
         private SettingsButton deleteSkinsButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 8aff4520b5..31e5b05596 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Game.Localisation;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Screens;
 
@@ -19,8 +20,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
-            HeaderText = "Failed to automatically locate an osu!stable installation.";
-            BodyText = "An existing install could not be located. If you know where it is, you can help locate it.";
+            HeaderText = MaintenanceSettingsStrings.StableDirectoryLocationHeader;
+            BodyText = MaintenanceSettingsStrings.StableDirectoryLocationBody;
             Icon = FontAwesome.Solid.QuestionCircle;
 
             Buttons = new PopupDialogButton[]
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 047d589689..22cf2e7076 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Localisation;
 using osu.Framework.Screens;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
-        public override LocalisableString HeaderText => "Please select your osu!stable install location";
+        public override LocalisableString HeaderText => MaintenanceSettingsStrings.StableDirectorySelectHeader;
 
         public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
         {

From b99b10e586e79367459983aa45aac55e33cd9654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= <azusa@binary0.jp>
Date: Fri, 16 Sep 2022 18:34:13 +0900
Subject: [PATCH 354/709] fix code style problem

---
 osu.Game/Localisation/MaintenanceSettingsStrings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Localisation/MaintenanceSettingsStrings.cs b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
index 8b7ca8d93a..4d7fdc60f7 100644
--- a/osu.Game/Localisation/MaintenanceSettingsStrings.cs
+++ b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Collections => new TranslatableString(getKey(@"collections"), @"Collections");
 
-
         /// <summary>
         /// "Scores"
         /// </summary>

From 3a62d292698aa279f765c154e6004317e3d92fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= <azusa@binary0.jp>
Date: Fri, 16 Sep 2022 18:43:59 +0900
Subject: [PATCH 355/709] fix tab spacing

---
 osu.Game/Localisation/GeneralSettingsStrings.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index bbad80976e..8506971756 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -65,9 +65,9 @@ namespace osu.Game.Localisation
         public static LocalisableString RunSetupWizard => new TranslatableString(getKey(@"run_setup_wizard"), @"Run setup wizard");
 
         /// <summary>
-		/// "You are running the latest release ({0})"
-		/// </summary>
-		public static LocalisableString RunningLatestRelease(string arg0) => new TranslatableString(getKey(@"running_latest_release"), @"You are running the latest release ({0})", arg0);
+        /// "You are running the latest release ({0})"
+        /// </summary>
+        public static LocalisableString RunningLatestRelease(string arg0) => new TranslatableString(getKey(@"running_latest_release"), @"You are running the latest release ({0})", arg0);
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }

From 85bb6f0beb859cf9f57d6ef6e68f28f557cb9c64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 00:54:16 +0900
Subject: [PATCH 356/709] Update framework

Update framework (again)

Update framework
---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 2c186a52dd..77c29a5d6e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.908.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.916.1" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fed7c27f07..29e690a024 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 496bfbb85c..83410b08f6 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.908.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.916.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.908.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 433bb5ae2492aeee65446eb44b29adcd4cfda61c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 15 Sep 2022 20:54:06 +0900
Subject: [PATCH 357/709] Add ServerShuttingDownCountdown

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 26 +++++++++++++++++++
 .../Multiplayer/MultiplayerCountdown.cs       |  1 +
 .../ServerShuttingDownCountdown.cs            | 20 ++++++++++++++
 osu.Game/Online/SignalRWorkaroundTypes.cs     |  3 ++-
 osu.Game/OsuGame.cs                           |  2 ++
 osu.Game/OsuGameBase.cs                       |  6 ++---
 6 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index c398d72118..20efe5662d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -18,6 +18,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Multiplayer.Countdown;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Utils;
@@ -26,6 +27,8 @@ namespace osu.Game.Online.Multiplayer
 {
     public abstract class MultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
+        public Action<Notification>? PostNotification { protected get; set; }
+
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
         /// </summary>
@@ -554,6 +557,14 @@ namespace osu.Game.Online.Multiplayer
                 {
                     case CountdownStartedEvent countdownStartedEvent:
                         Room.ActiveCountdowns.Add(countdownStartedEvent.Countdown);
+
+                        switch (countdownStartedEvent.Countdown)
+                        {
+                            case ServerShuttingDownCountdown:
+                                postServerShuttingDownNotification();
+                                break;
+                        }
+
                         break;
 
                     case CountdownStoppedEvent countdownStoppedEvent:
@@ -569,6 +580,21 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        private void postServerShuttingDownNotification()
+        {
+            ServerShuttingDownCountdown? countdown = room?.ActiveCountdowns.OfType<ServerShuttingDownCountdown>().FirstOrDefault();
+
+            if (countdown == null)
+                return;
+
+            PostNotification?.Invoke(new SimpleNotification
+            {
+                Text = countdown.FinalNotification
+                    ? $"The multiplayer server is restarting in {countdown.TimeRemaining:hh\\:mm\\:ss}. This multiplayer room will be closed shortly."
+                    : $"The multiplayer server is restarting in {countdown.TimeRemaining:hh\\:mm\\:ss}."
+            });
+        }
+
         Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
         {
             Scheduler.Add(() =>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
index fd22420b99..c59f5937b0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Online.Multiplayer
     [MessagePackObject]
     [Union(0, typeof(MatchStartCountdown))] // IMPORTANT: Add rules to SignalRUnionWorkaroundResolver for new derived types.
     [Union(1, typeof(ForceGameplayStartCountdown))]
+    [Union(2, typeof(ServerShuttingDownCountdown))]
     public abstract class MultiplayerCountdown
     {
         /// <summary>
diff --git a/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs b/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs
new file mode 100644
index 0000000000..4def3acc5e
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs
@@ -0,0 +1,20 @@
+// 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 MessagePack;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// A countdown that indicates the current multiplayer server is shutting down.
+    /// </summary>
+    [MessagePackObject]
+    public class ServerShuttingDownCountdown : MultiplayerCountdown
+    {
+        /// <summary>
+        /// If this is the final notification, no more <see cref="ServerShuttingDownCountdown"/> events will be sent after this.
+        /// </summary>
+        [Key(2)]
+        public bool FinalNotification { get; set; }
+    }
+}
diff --git a/osu.Game/Online/SignalRWorkaroundTypes.cs b/osu.Game/Online/SignalRWorkaroundTypes.cs
index 3518fbb4fe..0b545821ee 100644
--- a/osu.Game/Online/SignalRWorkaroundTypes.cs
+++ b/osu.Game/Online/SignalRWorkaroundTypes.cs
@@ -28,7 +28,8 @@ namespace osu.Game.Online
             (typeof(TeamVersusRoomState), typeof(MatchRoomState)),
             (typeof(TeamVersusUserState), typeof(MatchUserState)),
             (typeof(MatchStartCountdown), typeof(MultiplayerCountdown)),
-            (typeof(ForceGameplayStartCountdown), typeof(MultiplayerCountdown))
+            (typeof(ForceGameplayStartCountdown), typeof(MultiplayerCountdown)),
+            (typeof(ServerShuttingDownCountdown), typeof(MultiplayerCountdown)),
         };
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9e2384322a..63a46e63d6 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -730,6 +730,8 @@ namespace osu.Game
             ScoreManager.PostNotification = n => Notifications.Post(n);
             ScoreManager.PresentImport = items => PresentScore(items.First().Value);
 
+            MultiplayerClient.PostNotification = n => Notifications.Post(n);
+
             // make config aware of how to lookup skins for on-screen display purposes.
             // if this becomes a more common thing, tracked settings should be reconsidered to allow local DI.
             LocalConfig.LookupSkinName = id => SkinManager.Query(s => s.ID == id)?.ToString() ?? "Unknown";
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b30a065371..8b016e8eb0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -179,7 +179,7 @@ namespace osu.Game
 
         private SpectatorClient spectatorClient;
 
-        private MultiplayerClient multiplayerClient;
+        protected MultiplayerClient MultiplayerClient { get; private set; }
 
         private MetadataClient metadataClient;
 
@@ -284,7 +284,7 @@ namespace osu.Game
             // TODO: OsuGame or OsuGameBase?
             dependencies.CacheAs(beatmapUpdater = new BeatmapUpdater(BeatmapManager, difficultyCache, API, Storage));
             dependencies.CacheAs(spectatorClient = new OnlineSpectatorClient(endpoints));
-            dependencies.CacheAs(multiplayerClient = new OnlineMultiplayerClient(endpoints));
+            dependencies.CacheAs(MultiplayerClient = new OnlineMultiplayerClient(endpoints));
             dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints));
 
             AddInternal(new BeatmapOnlineChangeIngest(beatmapUpdater, realm, metadataClient));
@@ -329,7 +329,7 @@ namespace osu.Game
                 AddInternal(apiAccess);
 
             AddInternal(spectatorClient);
-            AddInternal(multiplayerClient);
+            AddInternal(MultiplayerClient);
             AddInternal(metadataClient);
 
             AddInternal(rulesetConfigCache);

From 81d582c051280ee3dbe6de607d654c7788ac7ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= <azusa@binary0.jp>
Date: Fri, 16 Sep 2022 21:08:25 +0900
Subject: [PATCH 358/709] fix review points and fine tuning

---
 osu.Game/Localisation/CommonStrings.cs        |  5 ++++
 osu.Game/Localisation/DebugSettingsStrings.cs | 15 -----------
 .../MaintenanceSettingsStrings.cs             | 25 -------------------
 osu.Game/Overlays/Dialog/ConfirmDialog.cs     |  3 ++-
 .../Sections/DebugSettings/MemorySettings.cs  |  6 ++---
 .../Settings/Sections/Input/TabletSettings.cs |  6 ++---
 .../Sections/Maintenance/BeatmapSettings.cs   |  2 +-
 .../Maintenance/CollectionsSettings.cs        |  2 +-
 .../Maintenance/MigrationSelectScreen.cs      |  4 +--
 .../Sections/Maintenance/ModPresetSettings.cs |  2 +-
 .../Sections/Maintenance/ScoreSettings.cs     |  2 +-
 .../Sections/Maintenance/SkinSettings.cs      |  2 +-
 .../StableDirectoryLocationDialog.cs          |  4 +--
 13 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index 93e3276f59..385ebd0593 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -89,6 +89,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Collections => new TranslatableString(getKey(@"collections"), @"Collections");
 
+        /// <summary>
+        /// "Mod presets"
+        /// </summary>
+        public static LocalisableString ModPresets => new TranslatableString(getKey(@"mod_presets"), @"Mod presets");
+
         /// <summary>
         /// "Name"
         /// </summary>
diff --git a/osu.Game/Localisation/DebugSettingsStrings.cs b/osu.Game/Localisation/DebugSettingsStrings.cs
index 66ce0fa109..dd21739096 100644
--- a/osu.Game/Localisation/DebugSettingsStrings.cs
+++ b/osu.Game/Localisation/DebugSettingsStrings.cs
@@ -44,21 +44,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString ClearAllCaches => new TranslatableString(getKey(@"clear_all_caches"), @"Clear all caches");
 
-        /// <summary>
-        /// "Compact realm"
-        /// </summary>
-        public static LocalisableString CompactRealm => new TranslatableString(getKey(@"compact_realm"), @"Compact realm");
-
-        /// <summary>
-        /// "Block realm"
-        /// </summary>
-        public static LocalisableString BlockRealm => new TranslatableString(getKey(@"block_realm"), @"Block realm");
-
-        /// <summary>
-        /// "Unblock realm"
-        /// </summary>
-        public static LocalisableString UnblockRealm => new TranslatableString(getKey(@"unblock_realm"), @"Unblock realm");
-
         private static string getKey(string key) => $"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Localisation/MaintenanceSettingsStrings.cs b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
index 4d7fdc60f7..4648682e64 100644
--- a/osu.Game/Localisation/MaintenanceSettingsStrings.cs
+++ b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
@@ -14,31 +14,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString MaintenanceSectionHeader => new TranslatableString(getKey(@"maintenance_section_header"), @"Maintenance");
 
-        /// <summary>
-        /// "Beatmaps"
-        /// </summary>
-        public static LocalisableString Beatmaps => new TranslatableString(getKey(@"beatmaps"), @"Beatmaps");
-
-        /// <summary>
-        /// "Skins"
-        /// </summary>
-        public static LocalisableString Skins => new TranslatableString(getKey(@"skins"), @"Skins");
-
-        /// <summary>
-        /// "Collections"
-        /// </summary>
-        public static LocalisableString Collections => new TranslatableString(getKey(@"collections"), @"Collections");
-
-        /// <summary>
-        /// "Scores"
-        /// </summary>
-        public static LocalisableString Scores => new TranslatableString(getKey(@"scores"), @"Scores");
-
-        /// <summary>
-        /// "Mod presets"
-        /// </summary>
-        public static LocalisableString ModPresets => new TranslatableString(getKey(@"mod_presets"), @"Mod presets");
-
         /// <summary>
         /// "Select directory"
         /// </summary>
diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index 8be865ee16..c17080f602 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -5,6 +5,7 @@
 
 using System;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Dialog
@@ -20,7 +21,7 @@ namespace osu.Game.Overlays.Dialog
         /// <param name="message">The description of the action to be displayed to the user.</param>
         /// <param name="onConfirm">An action to perform on confirmation.</param>
         /// <param name="onCancel">An optional action to perform on cancel.</param>
-        public ConfirmDialog(string message, Action onConfirm, Action onCancel = null)
+        public ConfirmDialog(LocalisableString message, Action onConfirm, Action onCancel = null)
         {
             HeaderText = message;
             BodyText = "Last chance to turn back";
diff --git a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
index 5ec09adfda..3afb060e49 100644
--- a/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/DebugSettings/MemorySettings.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
                 },
                 new SettingsButton
                 {
-                    Text = DebugSettingsStrings.CompactRealm,
+                    Text = "Compact realm",
                     Action = () =>
                     {
                         // Blocking operations implicitly causes a Compact().
@@ -46,11 +46,11 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
                 },
                 blockAction = new SettingsButton
                 {
-                    Text = DebugSettingsStrings.BlockRealm,
+                    Text = "Block realm",
                 },
                 unblockAction = new SettingsButton
                 {
-                    Text = DebugSettingsStrings.UnblockRealm,
+                    Text = "Unblock realm",
                 },
             };
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 43676c5bbe..e32639f476 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, LocalisationManager localisation)
         {
             Children = new Drawable[]
             {
@@ -110,9 +110,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows || RuntimeInfo.OS == RuntimeInfo.Platform.Linux)
                             {
                                 t.NewLine();
-                                var formattedSource = MessageFormatter.FormatText(TabletSettingsStrings.NoTabletDetectedDescription(RuntimeInfo.OS == RuntimeInfo.Platform.Windows
+                                var formattedSource = MessageFormatter.FormatText(localisation.GetLocalisedBindableString(TabletSettingsStrings.NoTabletDetectedDescription(RuntimeInfo.OS == RuntimeInfo.Platform.Windows
                                     ? @"https://opentabletdriver.net/Wiki/FAQ/Windows"
-                                    : @"https://opentabletdriver.net/Wiki/FAQ/Linux").ToString());
+                                    : @"https://opentabletdriver.net/Wiki/FAQ/Linux")).Value);
                                 t.AddLinks(formattedSource.Text, formattedSource.Links);
                             }
                         }),
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
index 00342faf3b..beae5a6aad 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class BeatmapSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => MaintenanceSettingsStrings.Beatmaps;
+        protected override LocalisableString Header => CommonStrings.Beatmaps;
 
         private SettingsButton importBeatmapsButton = null!;
         private SettingsButton deleteBeatmapsButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
index 9ec6f59fb5..17fef37e40 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class CollectionsSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => MaintenanceSettingsStrings.Collections;
+        protected override LocalisableString Header => CommonStrings.Collections;
 
         private SettingsButton importCollectionsButton = null!;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 2f4f04fbc2..5de33fdd55 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -52,9 +52,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     // Quick test for whether there's already an osu! install at the target path.
                     if (fileInfos.Any(f => f.Name == OsuGameBase.CLIENT_DATABASE_FILENAME))
                     {
-                        dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.TargetDirectoryAlreadyInstalledOsu.ToString(), () =>
+                        dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.TargetDirectoryAlreadyInstalledOsu, () =>
                             {
-                                dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.RestartAndReOpenRequiredForCompletion.ToString(), () =>
+                                dialogOverlay.Push(new ConfirmDialog(MaintenanceSettingsStrings.RestartAndReOpenRequiredForCompletion, () =>
                                 {
                                     (storage as OsuStorage)?.ChangeDataPath(target.FullName);
                                     game.Exit();
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
index 3e3138f041..51f6e1bf60 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ModPresetSettings.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class ModPresetSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => MaintenanceSettingsStrings.ModPresets;
+        protected override LocalisableString Header => CommonStrings.ModPresets;
 
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
index 6377d59e2a..eb2d3171ea 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class ScoreSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => MaintenanceSettingsStrings.Scores;
+        protected override LocalisableString Header => CommonStrings.Scores;
 
         private SettingsButton importScoresButton = null!;
         private SettingsButton deleteScoresButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
index 893981f3d9..93c65513b7 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
     public class SkinSettings : SettingsSubsection
     {
-        protected override LocalisableString Header => MaintenanceSettingsStrings.Skins;
+        protected override LocalisableString Header => CommonStrings.Skins;
 
         private SettingsButton importSkinsButton = null!;
         private SettingsButton deleteSkinsButton = null!;
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 31e5b05596..7b7ea7cee0 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -28,12 +28,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             {
                 new PopupDialogOkButton
                 {
-                    Text = "Sure! I know where it is located!",
+                    Text = MaintenanceSettingsStrings.StableDirectoryLocationOk,
                     Action = () => Schedule(() => performer.PerformFromScreen(screen => screen.Push(new StableDirectorySelectScreen(taskCompletionSource))))
                 },
                 new PopupDialogCancelButton
                 {
-                    Text = "Actually I don't have osu!stable installed.",
+                    Text = MaintenanceSettingsStrings.StableDirectoryLocationCancel,
                     Action = () => taskCompletionSource.TrySetCanceled()
                 }
             };

From 92b2417d4c7afbde92896e234bcae9b3fcc6f717 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 16 Sep 2022 21:10:11 +0900
Subject: [PATCH 359/709] Post notification when room joined

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 20efe5662d..f9236cbfac 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -210,6 +210,8 @@ namespace osu.Game.Online.Multiplayer
 
                     updateLocalRoomSettings(joinedRoom.Settings);
 
+                    postServerShuttingDownNotification();
+
                     OnRoomJoined();
                 }, cancellationSource.Token).ConfigureAwait(false);
             }, cancellationSource.Token).ConfigureAwait(false);

From 877165eb98f02fa0531cac2d63e86cb3626ff868 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 16:16:53 +0300
Subject: [PATCH 360/709] Allow specifying icon colour on simple notifications

---
 osu.Game/Overlays/Notifications/SimpleNotification.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs
index 1dba60fb5f..f3bb6a0578 100644
--- a/osu.Game/Overlays/Notifications/SimpleNotification.cs
+++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
@@ -41,6 +42,12 @@ namespace osu.Game.Overlays.Notifications
             }
         }
 
+        public ColourInfo IconColour
+        {
+            get => IconContent.Colour;
+            set => IconContent.Colour = value;
+        }
+
         private TextFlowContainer? textDrawable;
 
         private SpriteIcon? iconDrawable;

From 110652592fc3a96c36e2d6e9b2f0639ea5c2f192 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 16:17:24 +0300
Subject: [PATCH 361/709] Display readable tablet notifications and link to
 supported list page

---
 osu.Game/OsuGame.cs     | 49 +++++++++++++++++++++++++++++++++++++++--
 osu.Game/OsuGameBase.cs |  4 +++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0d115f62fe..ce0a961190 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -24,6 +24,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -187,7 +188,8 @@ namespace osu.Game
         {
             this.args = args;
 
-            forwardLoggedErrorsToNotifications();
+            forwardRuntimeLogsToNotifications();
+            forwardTabletLogsToNotifications();
 
             SentryLogger = new SentryLogger(this);
         }
@@ -992,7 +994,7 @@ namespace osu.Game
                 overlay.Depth = (float)-Clock.CurrentTime;
         }
 
-        private void forwardLoggedErrorsToNotifications()
+        private void forwardRuntimeLogsToNotifications()
         {
             int recentLogCount = 0;
 
@@ -1033,6 +1035,49 @@ namespace osu.Game
             };
         }
 
+        private void forwardTabletLogsToNotifications()
+        {
+            bool notifyOnWarning = true;
+
+            Logger.NewEntry += entry =>
+            {
+                if (entry.Level < LogLevel.Important || entry.LoggerName != ITabletHandler.LOGGER_NAME)
+                    return;
+
+                if (entry.Level == LogLevel.Error)
+                {
+                    Schedule(() => Notifications.Post(new SimpleNotification
+                    {
+                        Text = $"Encountered tablet error: \"{entry.Message}\"",
+                        Icon = FontAwesome.Solid.PenSquare,
+                        IconColour = Colours.RedDark,
+                    }));
+                }
+                else if (notifyOnWarning)
+                {
+                    Schedule(() => Notifications.Post(new SimpleNotification
+                    {
+                        Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.",
+                        Icon = FontAwesome.Solid.PenSquare,
+                        IconColour = Colours.YellowDark,
+                        Activated = () =>
+                        {
+                            OpenUrlExternally("https://opentabletdriver.net/Tablets", true);
+                            return true;
+                        }
+                    }));
+
+                    notifyOnWarning = false;
+                }
+            };
+
+            Schedule(() =>
+            {
+                ITabletHandler tablet = Host.AvailableInputHandlers.OfType<ITabletHandler>().SingleOrDefault();
+                tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true);
+            });
+        }
+
         private Task asyncLoadStream;
 
         /// <summary>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b30a065371..9bc4508e42 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -124,6 +124,8 @@ namespace osu.Game
 
         protected SessionStatics SessionStatics { get; private set; }
 
+        protected OsuColour Colours { get; private set; }
+
         protected BeatmapManager BeatmapManager { get; private set; }
 
         protected BeatmapModelDownloader BeatmapDownloader { get; private set; }
@@ -308,7 +310,7 @@ namespace osu.Game
                 dependencies.CacheAs(powerStatus);
 
             dependencies.Cache(SessionStatics = new SessionStatics());
-            dependencies.Cache(new OsuColour());
+            dependencies.Cache(Colours = new OsuColour());
 
             RegisterImportHandler(BeatmapManager);
             RegisterImportHandler(ScoreManager);

From f512106bee0ae1adc2faa16eb3abc09d3552b7a4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 20:00:38 +0300
Subject: [PATCH 362/709] Adjust test scene to match expectations

- Adds a scenario where no button is pressed before second hitobject.
- Adjusts press time to not conflict with break start time.
---
 .../Mods/TestSceneOsuModAlternate.cs          | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
index 5e46498aca..8994abcea5 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
+using AutoMapper.Internal;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
@@ -125,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         /// Ensures alternation is reset before the first hitobject after a break.
         /// </summary>
         [Test]
-        public void TestInputSingularWithBreak() => CreateModTest(new ModTestData
+        public void TestInputSingularWithBreak([Values] bool pressBeforeSecondObject) => CreateModTest(new ModTestData
         {
             Mod = new OsuModAlternate(),
             PassCondition = () => Player.ScoreProcessor.Combo.Value == 0 && Player.ScoreProcessor.HighestCombo.Value == 2,
@@ -155,21 +157,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                     },
                 }
             },
-            ReplayFrames = new List<ReplayFrame>
+            ReplayFrames = new ReplayFrame[]
             {
                 // first press to start alternate lock.
-                new OsuReplayFrame(500, new Vector2(100), OsuAction.LeftButton),
-                new OsuReplayFrame(501, new Vector2(100)),
-                // press same key after break but before hit object.
-                new OsuReplayFrame(2250, new Vector2(300, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(2251, new Vector2(300, 100)),
+                new OsuReplayFrame(450, new Vector2(100), OsuAction.LeftButton),
+                new OsuReplayFrame(451, new Vector2(100)),
                 // press same key at second hitobject and ensure it has been hit.
-                new OsuReplayFrame(2500, new Vector2(500, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(2501, new Vector2(500, 100)),
+                new OsuReplayFrame(2450, new Vector2(500, 100), OsuAction.LeftButton),
+                new OsuReplayFrame(2451, new Vector2(500, 100)),
                 // press same key at third hitobject and ensure it has been missed.
-                new OsuReplayFrame(3000, new Vector2(500, 100), OsuAction.LeftButton),
-                new OsuReplayFrame(3001, new Vector2(500, 100)),
-            }
+                new OsuReplayFrame(2950, new Vector2(500, 100), OsuAction.LeftButton),
+                new OsuReplayFrame(2951, new Vector2(500, 100)),
+            }.Concat(!pressBeforeSecondObject
+                ? Enumerable.Empty<ReplayFrame>()
+                : new ReplayFrame[]
+                {
+                    // press same key after break but before hit object.
+                    new OsuReplayFrame(2250, new Vector2(300, 100), OsuAction.LeftButton),
+                    new OsuReplayFrame(2251, new Vector2(300, 100)),
+                }
+            ).ToList()
         });
     }
 }

From 557b39b69b051cc4bc3e74ac9d7fc775f0dc1d21 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 19:48:24 +0300
Subject: [PATCH 363/709] Fix `InputBlockingMod` not always clearing last
 action on break periods

---
 osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs b/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
index a7aca8257b..e4e8905722 100644
--- a/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
+++ b/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
@@ -18,7 +18,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public abstract class InputBlockingMod : Mod, IApplicableToDrawableRuleset<OsuHitObject>
+    public abstract class InputBlockingMod : Mod, IApplicableToDrawableRuleset<OsuHitObject>, IUpdatableByPlayfield
     {
         public override double ScoreMultiplier => 1.0;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModRelax), typeof(OsuModCinema) };
@@ -62,15 +62,18 @@ namespace osu.Game.Rulesets.Osu.Mods
             gameplayClock = drawableRuleset.FrameStableClock;
         }
 
+        public void Update(Playfield playfield)
+        {
+            if (LastAcceptedAction != null && nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
+                LastAcceptedAction = null;
+        }
+
         protected abstract bool CheckValidNewAction(OsuAction action);
 
         private bool checkCorrectAction(OsuAction action)
         {
             if (nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
-            {
-                LastAcceptedAction = null;
                 return true;
-            }
 
             switch (action)
             {

From fe7223711890b614cdc2eabf9933d6400da73b9e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 20:08:50 +0300
Subject: [PATCH 364/709] Remove unused using

---
 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
index 8994abcea5..521c10c10c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAlternate.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using AutoMapper.Internal;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;

From 288cc7b201b8a404dc677017fe002220c4b2ab97 Mon Sep 17 00:00:00 2001
From: vegguid <75315940+vegguid@users.noreply.github.com>
Date: Fri, 16 Sep 2022 21:36:17 +0200
Subject: [PATCH 365/709] Fixed Leaderboard tooltip not following time format
 setting

---
 .../Leaderboards/LeaderboardScoreTooltip.cs      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 2f3ece0e3b..7123a274d4 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -15,6 +15,8 @@ using osu.Framework.Localisation;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -24,7 +26,7 @@ namespace osu.Game.Online.Leaderboards
         private FillFlowContainer<HitResultCell> topScoreStatistics = null!;
         private FillFlowContainer<HitResultCell> bottomScoreStatistics = null!;
         private FillFlowContainer<ModCell> modStatistics = null!;
-
+        private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
         public LeaderboardScoreTooltip()
         {
             AutoSizeAxes = Axes.Both;
@@ -36,8 +38,9 @@ namespace osu.Game.Online.Leaderboards
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OsuConfigManager configManager)
         {
+            configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -92,6 +95,13 @@ namespace osu.Game.Online.Leaderboards
             };
         }
 
+        private void updateDisplay()
+        {
+            if (displayedScore != null)
+            {
+                timestampLabel.Text = prefer24HourTime.Value ? $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy h:mm tt}";
+            }
+        }
         private ScoreInfo? displayedScore;
 
         public void SetContent(ScoreInfo score)
@@ -101,7 +111,7 @@ namespace osu.Game.Online.Leaderboards
 
             displayedScore = score;
 
-            timestampLabel.Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}";
+            prefer24HourTime.BindValueChanged(_ => updateDisplay(), true);
 
             modStatistics.Clear();
             topScoreStatistics.Clear();

From 48527f2d076faddf0288903ac06ecf0daa16b8c6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 16 Sep 2022 22:50:49 +0300
Subject: [PATCH 366/709] Ignore case during logger name comparison

---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ce0a961190..9a63ccbf48 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1041,7 +1041,7 @@ namespace osu.Game
 
             Logger.NewEntry += entry =>
             {
-                if (entry.Level < LogLevel.Important || entry.LoggerName != ITabletHandler.LOGGER_NAME)
+                if (entry.Level < LogLevel.Important || !entry.LoggerName.Equals(ITabletHandler.LOGGER_NAME, StringComparison.OrdinalIgnoreCase))
                     return;
 
                 if (entry.Level == LogLevel.Error)

From 0d76f4501d4cb47d7a0f7880b9c9c19755315d12 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sat, 17 Sep 2022 10:10:20 +0100
Subject: [PATCH 367/709] Revert "Set InvalidationSource to Self"

This reverts commit 2092008251cf5d0cc4846763b86719155f59a8bd.
---
 osu.Game/Screens/Play/SquareGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index a1e004bfcc..00d6ede3bf 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize, InvalidationSource.Self);
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
         private ScheduledDelegate scheduledCreate;
 
         protected override void Update()

From e3d5ba530147644677938b74f68de09359c6c776 Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sat, 17 Sep 2022 10:45:04 +0100
Subject: [PATCH 368/709] Check if graph DrawSize changed

---
 osu.Game/Screens/Play/SquareGraph.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 00d6ede3bf..092e056c85 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -78,11 +78,13 @@ namespace osu.Game.Screens.Play
         private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
         private ScheduledDelegate scheduledCreate;
 
+        private Vector2 previousDrawSize;
+
         protected override void Update()
         {
             base.Update();
 
-            if (values != null && !layout.IsValid)
+            if (values != null && !layout.IsValid && DrawSize != previousDrawSize)
             {
                 columns?.FadeOut(500, Easing.OutQuint).Expire();
 
@@ -90,6 +92,7 @@ namespace osu.Game.Screens.Play
                 scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
 
                 layout.Validate();
+                previousDrawSize = DrawSize;
             }
         }
 

From 0bfe967452a0ae9a910d4ca31318aed155c58608 Mon Sep 17 00:00:00 2001
From: vegguid <75315940+vegguid@users.noreply.github.com>
Date: Sat, 17 Sep 2022 12:58:23 +0200
Subject: [PATCH 369/709] moved BindValueChanged to LoadComplete

---
 .../Leaderboards/LeaderboardScoreTooltip.cs   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 7123a274d4..0651fe0072 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -94,13 +94,11 @@ namespace osu.Game.Online.Leaderboards
                 }
             };
         }
-
-        private void updateDisplay()
+        protected override void LoadComplete()
         {
-            if (displayedScore != null)
-            {
-                timestampLabel.Text = prefer24HourTime.Value ? $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy h:mm tt}";
-            }
+            base.LoadComplete();
+
+            prefer24HourTime.BindValueChanged(_ => updateTimestampLabel(), true);
         }
         private ScoreInfo? displayedScore;
 
@@ -111,7 +109,7 @@ namespace osu.Game.Online.Leaderboards
 
             displayedScore = score;
 
-            prefer24HourTime.BindValueChanged(_ => updateDisplay(), true);
+            updateTimestampLabel();
 
             modStatistics.Clear();
             topScoreStatistics.Clear();
@@ -130,6 +128,13 @@ namespace osu.Game.Online.Leaderboards
                     topScoreStatistics.Add(new HitResultCell(result));
             }
         }
+        private void updateTimestampLabel()
+        {
+            if (displayedScore != null)
+            {
+                timestampLabel.Text = prefer24HourTime.Value ? $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy h:mm tt}";
+            }
+        }
 
         protected override void PopIn() => this.FadeIn(20, Easing.OutQuint);
         protected override void PopOut() => this.FadeOut(80, Easing.OutQuint);

From a1d830e47f3728329353a39be1fce94de727c483 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Sep 2022 22:22:56 +0900
Subject: [PATCH 370/709] Fix formatting

---
 osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
index 0651fe0072..f51f57c031 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Online.Leaderboards
         private FillFlowContainer<HitResultCell> bottomScoreStatistics = null!;
         private FillFlowContainer<ModCell> modStatistics = null!;
         private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
+
         public LeaderboardScoreTooltip()
         {
             AutoSizeAxes = Axes.Both;
@@ -94,12 +95,14 @@ namespace osu.Game.Online.Leaderboards
                 }
             };
         }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             prefer24HourTime.BindValueChanged(_ => updateTimestampLabel(), true);
         }
+
         private ScoreInfo? displayedScore;
 
         public void SetContent(ScoreInfo score)
@@ -128,11 +131,14 @@ namespace osu.Game.Online.Leaderboards
                     topScoreStatistics.Add(new HitResultCell(result));
             }
         }
+
         private void updateTimestampLabel()
         {
             if (displayedScore != null)
             {
-                timestampLabel.Text = prefer24HourTime.Value ? $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy HH:mm}" : $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy h:mm tt}";
+                timestampLabel.Text = prefer24HourTime.Value
+                    ? $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy HH:mm}"
+                    : $"Played on {displayedScore.Date.ToLocalTime():d MMMM yyyy h:mm tt}";
             }
         }
 

From d580b07063f2c83bd165809f210c82c64ee7b19e Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sat, 17 Sep 2022 14:40:36 +0100
Subject: [PATCH 371/709] Refactor update condition logic

---
 osu.Game/Screens/Play/SquareGraph.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 092e056c85..210ae21156 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -15,7 +15,6 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
-using osu.Framework.Layout;
 using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
@@ -24,11 +23,6 @@ namespace osu.Game.Screens.Play
     {
         private BufferedContainer<Column> columns;
 
-        public SquareGraph()
-        {
-            AddLayout(layout);
-        }
-
         public int ColumnCount => columns?.Children.Count ?? 0;
 
         private int progress;
@@ -57,7 +51,7 @@ namespace osu.Game.Screens.Play
                 if (value == values) return;
 
                 values = value;
-                layout.Invalidate();
+                graphNeedsUpdate = true;
             }
         }
 
@@ -75,24 +69,25 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
         private ScheduledDelegate scheduledCreate;
 
+        private bool graphNeedsUpdate = false;
+
         private Vector2 previousDrawSize;
 
         protected override void Update()
         {
             base.Update();
 
-            if (values != null && !layout.IsValid && DrawSize != previousDrawSize)
+            if (graphNeedsUpdate || (values != null && DrawSize != previousDrawSize))
             {
                 columns?.FadeOut(500, Easing.OutQuint).Expire();
 
                 scheduledCreate?.Cancel();
                 scheduledCreate = Scheduler.AddDelayed(RecreateGraph, 500);
 
-                layout.Validate();
                 previousDrawSize = DrawSize;
+                graphNeedsUpdate = false;
             }
         }
 

From 0b6a77bc8bd90c76aa9fbf491d6542e5e7dff887 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 15:59:42 +0200
Subject: [PATCH 372/709] EditorBeatmap's TimelineZoom should never be zero

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 16c0064e80..356276039c 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Screens.Edit
             PlayableBeatmap.ControlPointInfo = ConvertControlPoints(PlayableBeatmap.ControlPointInfo);
 
             this.beatmapInfo = beatmapInfo ?? playableBeatmap.BeatmapInfo;
+            if (this.beatmapInfo.TimelineZoom <= 0) this.beatmapInfo.TimelineZoom = 1;
 
             if (beatmapSkin is Skin skin)
             {

From 2dfa89c62e255c4d806db3ea8ab92aa028afedca Mon Sep 17 00:00:00 2001
From: HiddenNode <hiddingnode@gmail.com>
Date: Sat, 17 Sep 2022 15:05:25 +0100
Subject: [PATCH 373/709] Clean up

---
 osu.Game/Screens/Play/SquareGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 210ae21156..9ac673ae52 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Play
 
         private ScheduledDelegate scheduledCreate;
 
-        private bool graphNeedsUpdate = false;
+        private bool graphNeedsUpdate;
 
         private Vector2 previousDrawSize;
 

From 51841988bf32532267a65c3e0bb3f28d335ae1f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 15:40:20 +0900
Subject: [PATCH 374/709] Rename references to `DefaultSkin` to have
 `Triangles` suffix

---
 .../TestSceneCatchSkinConfiguration.cs        |  2 +-
 .../Editor/TestSceneManiaComposeScreen.cs     |  2 +-
 .../TestSceneHitCircleArea.cs                 |  2 +-
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs     |  4 ++--
 .../Gameplay/TestSceneBeatmapSkinFallbacks.cs |  2 +-
 .../Navigation/TestSceneEditDefaultSkin.cs    |  4 ++--
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +-
 .../Backgrounds/BackgroundScreenDefault.cs    |  2 +-
 ...DefaultSkin.cs => DefaultSkinTriangles.cs} | 10 +++++-----
 .../Skinning/RulesetSkinProvidingContainer.cs |  2 +-
 osu.Game/Skinning/SkinInfo.cs                 |  2 +-
 osu.Game/Skinning/SkinManager.cs              | 20 +++++++++----------
 osu.Game/Skinning/SkinnableSprite.cs          |  2 +-
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |  6 +++---
 14 files changed, 31 insertions(+), 31 deletions(-)
 rename osu.Game/Skinning/{DefaultSkin.cs => DefaultSkinTriangles.cs} (95%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
index 6ecbf58a52..06235d3744 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
         }
 
-        private class TestSkin : DefaultSkin
+        private class TestSkin : DefaultSkinTriangles
         {
             public bool FlipCatcherPlate { get; set; }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
index 0354228cca..9e02424eb8 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestDefaultSkin()
         {
-            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = DefaultSkin.CreateInfo().ToLiveUnmanaged());
+            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged());
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 0cf2ec6b7e..d3f58ca868 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin(null))
+            Child = new SkinProvidingContainer(new DefaultSkinTriangles(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index c3c10215a5..57f2578200 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Skins.IO
             skinManager.CurrentSkinInfo.Value.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
-                Assert.AreEqual(typeof(DefaultSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(DefaultSkinTriangles), s.CreateInstance(skinManager).GetType());
 
                 new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
 
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Skins.IO
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
-                Assert.AreEqual(typeof(DefaultSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(DefaultSkinTriangles), s.CreateInstance(skinManager).GetType());
             });
 
             return Task.CompletedTask;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index e12be6d3b4..b24a65820d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestEmptyLegacyBeatmapSkinFallsBack()
         {
-            CreateSkinTest(DefaultSkin.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
+            CreateSkinTest(DefaultSkinTriangles.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
             AddUntilStep("wait for hud load", () => Player.ChildrenOfType<SkinnableTargetContainer>().All(c => c.ComponentsLoaded));
             AddAssert("hud from default skin", () => AssertComponentsFromExpectedSource(SkinnableTarget.MainHUDComponents, skinManager.CurrentSkin.Value));
         }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
index 4ca55e8744..bc6458b62b 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestEditDefaultSkin()
         {
-            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.DEFAULT_SKIN);
+            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.DEFAULT_SKIN_TRIANGLES);
 
             AddStep("open settings", () => { Game.Settings.Show(); });
 
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("open skin editor", () => skinEditor.Show());
 
             // Until step required as the skin editor may take time to load (and an extra scheduled frame for the mutable part).
-            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.DEFAULT_SKIN);
+            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.DEFAULT_SKIN_TRIANGLES);
             AddAssert("is not protected", () => skinManager.CurrentSkinInfo.Value.PerformRead(s => !s.Protected));
 
             AddUntilStep("export button enabled", () => Game.Settings.ChildrenOfType<SkinSection.ExportSkinButton>().SingleOrDefault()?.Enabled.Value == true);
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 5f49557685..ec97508522 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Configuration
         {
             // UI/selection defaults
             SetDefault(OsuSetting.Ruleset, string.Empty);
-            SetDefault(OsuSetting.Skin, SkinInfo.DEFAULT_SKIN.ToString());
+            SetDefault(OsuSetting.Skin, SkinInfo.DEFAULT_SKIN_TRIANGLES.ToString());
 
             SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
             SetDefault(OsuSetting.BeatmapDetailModsFilter, false);
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index c794c768c6..e04e6d4849 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Backgrounds
 
                     case BackgroundSource.Skin:
                         // default skins should use the default background rotation, which won't be the case if a SkinBackground is created for them.
-                        if (skin.Value is DefaultSkin || skin.Value is DefaultLegacySkin)
+                        if (skin.Value is DefaultSkinTriangles || skin.Value is DefaultLegacySkin)
                             break;
 
                         newBackground = new SkinBackground(skin.Value, getBackgroundTextureName());
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkinTriangles.cs
similarity index 95%
rename from osu.Game/Skinning/DefaultSkin.cs
rename to osu.Game/Skinning/DefaultSkinTriangles.cs
index f10e8412b1..26d933105a 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkinTriangles.cs
@@ -22,26 +22,26 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class DefaultSkin : Skin
+    public class DefaultSkinTriangles : Skin
     {
         public static SkinInfo CreateInfo() => new SkinInfo
         {
-            ID = osu.Game.Skinning.SkinInfo.DEFAULT_SKIN,
+            ID = osu.Game.Skinning.SkinInfo.DEFAULT_SKIN_TRIANGLES,
             Name = "osu! (triangles)",
             Creator = "team osu!",
             Protected = true,
-            InstantiationInfo = typeof(DefaultSkin).GetInvariantInstantiationInfo()
+            InstantiationInfo = typeof(DefaultSkinTriangles).GetInvariantInstantiationInfo()
         };
 
         private readonly IStorageResourceProvider resources;
 
-        public DefaultSkin(IStorageResourceProvider resources)
+        public DefaultSkinTriangles(IStorageResourceProvider resources)
             : this(CreateInfo(), resources)
         {
         }
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
-        public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
+        public DefaultSkinTriangles(SkinInfo skin, IStorageResourceProvider resources)
             : base(skin, resources)
         {
             this.resources = resources;
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index d5690710bb..9ece48a6cb 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Skinning
                 }
             }
 
-            int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<DefaultSkin>().LastOrDefault());
+            int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<DefaultSkinTriangles>().LastOrDefault());
 
             // Ruleset resources should be given the ability to override game-wide defaults
             // This is achieved by placing them before the last instance of DefaultSkin.
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index bf3cf77257..2984381604 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
     [JsonObject(MemberSerialization.OptIn)]
     public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
     {
-        internal static readonly Guid DEFAULT_SKIN = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
+        internal static readonly Guid DEFAULT_SKIN_TRIANGLES = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
         internal static readonly Guid CLASSIC_SKIN = new Guid("81F02CD3-EEC6-4865-AC23-FAE26A386187");
         internal static readonly Guid RANDOM_SKIN = new Guid("D39DFEFB-477C-4372-B1EA-2BCEA5FB8908");
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 7ffea3b54f..bce58424d4 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -49,9 +49,9 @@ namespace osu.Game.Skinning
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>();
 
-        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(Skinning.DefaultSkin.CreateInfo().ToLiveUnmanaged())
+        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged())
         {
-            Default = Skinning.DefaultSkin.CreateInfo().ToLiveUnmanaged()
+            Default = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged()
         };
 
         private readonly SkinImporter skinImporter;
@@ -61,7 +61,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// The default skin.
         /// </summary>
-        public Skin DefaultSkin { get; }
+        public Skin DefaultSkinTriangles { get; }
 
         /// <summary>
         /// The default legacy skin.
@@ -86,7 +86,7 @@ namespace osu.Game.Skinning
             var defaultSkins = new[]
             {
                 DefaultLegacySkin = new DefaultLegacySkin(this),
-                DefaultSkin = new DefaultSkin(this),
+                DefaultSkinTriangles = new DefaultSkinTriangles(this),
             };
 
             // Ensure the default entries are present.
@@ -104,7 +104,7 @@ namespace osu.Game.Skinning
                 CurrentSkin.Value = skin.NewValue.PerformRead(GetSkin);
             };
 
-            CurrentSkin.Value = DefaultSkin;
+            CurrentSkin.Value = DefaultSkinTriangles;
             CurrentSkin.ValueChanged += skin =>
             {
                 if (!skin.NewValue.SkinInfo.Equals(CurrentSkinInfo.Value))
@@ -125,7 +125,7 @@ namespace osu.Game.Skinning
 
                 if (randomChoices.Length == 0)
                 {
-                    CurrentSkinInfo.Value = Skinning.DefaultSkin.CreateInfo().ToLiveUnmanaged();
+                    CurrentSkinInfo.Value = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged();
                     return;
                 }
 
@@ -232,8 +232,8 @@ namespace osu.Game.Skinning
                 if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultLegacySkin)
                     yield return DefaultLegacySkin;
 
-                if (CurrentSkin.Value != DefaultSkin)
-                    yield return DefaultSkin;
+                if (CurrentSkin.Value != DefaultSkinTriangles)
+                    yield return DefaultSkinTriangles;
             }
         }
 
@@ -294,7 +294,7 @@ namespace osu.Game.Skinning
                 Guid currentUserSkin = CurrentSkinInfo.Value.ID;
 
                 if (items.Any(s => s.ID == currentUserSkin))
-                    scheduler.Add(() => CurrentSkinInfo.Value = Skinning.DefaultSkin.CreateInfo().ToLiveUnmanaged());
+                    scheduler.Add(() => CurrentSkinInfo.Value = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged());
 
                 Delete(items.ToList(), silent);
             });
@@ -313,7 +313,7 @@ namespace osu.Game.Skinning
                     skinInfo = DefaultLegacySkin.SkinInfo;
             }
 
-            CurrentSkinInfo.Value = skinInfo ?? DefaultSkin.SkinInfo;
+            CurrentSkinInfo.Value = skinInfo ?? DefaultSkinTriangles.SkinInfo;
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 57beb6e803..cb4a91691e 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Skinning
 
                 // Temporarily used to exclude undesirable ISkin implementations
                 static bool isUserSkin(ISkin skin)
-                    => skin.GetType() == typeof(DefaultSkin)
+                    => skin.GetType() == typeof(DefaultSkinTriangles)
                        || skin.GetType() == typeof(DefaultLegacySkin)
                        || skin.GetType() == typeof(LegacySkin);
             }
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 7278e1e93f..21ecdf7dbe 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual
     public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
         private Skin metricsSkin;
-        private Skin defaultSkin;
+        private Skin defaultSkinTriangles;
         private Skin specialSkin;
         private Skin oldSkin;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual
             var dllStore = new DllResourceStore(GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
-            defaultSkin = new DefaultLegacySkin(this);
+            defaultSkinTriangles = new DefaultLegacySkin(this);
             specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
             oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual
 
             Cell(0).Child = createProvider(null, creationFunction, beatmap);
             Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
-            Cell(2).Child = createProvider(defaultSkin, creationFunction, beatmap);
+            Cell(2).Child = createProvider(defaultSkinTriangles, creationFunction, beatmap);
             Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
             Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
         }

From 3e28ab72cefb4b28e1566662b75b72ed4fe1a016 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 15:49:15 +0900
Subject: [PATCH 375/709] Standardise default skin names

---
 osu.Game/Skinning/DefaultLegacySkin.cs    | 2 +-
 osu.Game/Skinning/DefaultSkinTriangles.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 2ebcc98c53..04f1286dc7 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Skinning
         public static SkinInfo CreateInfo() => new SkinInfo
         {
             ID = Skinning.SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
-            Name = "osu!classic",
+            Name = "osu! \"classic\" (2013)",
             Creator = "team osu!",
             Protected = true,
             InstantiationInfo = typeof(DefaultLegacySkin).GetInvariantInstantiationInfo()
diff --git a/osu.Game/Skinning/DefaultSkinTriangles.cs b/osu.Game/Skinning/DefaultSkinTriangles.cs
index 26d933105a..02df247c36 100644
--- a/osu.Game/Skinning/DefaultSkinTriangles.cs
+++ b/osu.Game/Skinning/DefaultSkinTriangles.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Skinning
         public static SkinInfo CreateInfo() => new SkinInfo
         {
             ID = osu.Game.Skinning.SkinInfo.DEFAULT_SKIN_TRIANGLES,
-            Name = "osu! (triangles)",
+            Name = "osu! \"triangles\" (2017)",
             Creator = "team osu!",
             Protected = true,
             InstantiationInfo = typeof(DefaultSkinTriangles).GetInvariantInstantiationInfo()

From 487378f732989463c2431c4075d873e623da86fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 15:49:26 +0900
Subject: [PATCH 376/709] Fallback to default skin if instantiation fails

---
 osu.Game/Skinning/SkinInfo.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 2984381604..9e268fd7ec 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -47,7 +47,17 @@ namespace osu.Game.Skinning
                 ? typeof(LegacySkin)
                 : Type.GetType(InstantiationInfo).AsNonNull();
 
-            return (Skin)Activator.CreateInstance(type, this, resources);
+            try
+            {
+                return (Skin)Activator.CreateInstance(type, this, resources);
+            }
+            catch
+            {
+                // This defaults to triangles to catch the case where a user has a modified triangles skin.
+                // If we ever add more default skins in the future this will need some kind of proper migration rather than
+                // a single catch.
+                return new DefaultSkinTriangles(this, resources);
+            }
         }
 
         public IList<RealmNamedFileUsage> Files { get; } = null!;

From 64ee2108257326c9f188a966726732d097d531f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:17:48 +0900
Subject: [PATCH 377/709] Add realm migration to update skin names

---
 osu.Game/Database/RealmAccess.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cefc7da503..edcd020226 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -69,8 +69,9 @@ namespace osu.Game.Database
         /// 22   2022-07-31    Added ModPreset.
         /// 23   2022-08-01    Added LastLocalUpdate to BeatmapInfo.
         /// 24   2022-08-22    Added MaximumStatistics to ScoreInfo.
+        /// 25   2022-09-18    Remove skins to add with new naming.
         /// </summary>
-        private const int schema_version = 24;
+        private const int schema_version = 25;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.
@@ -870,6 +871,11 @@ namespace osu.Game.Database
                     }
 
                     break;
+
+                case 25:
+                    // Remove the default skins so they can be added back by SkinManager with updated naming.
+                    migration.NewRealm.RemoveRange(migration.NewRealm.All<SkinInfo>().Where(s => s.Protected));
+                    break;
             }
         }
 

From 1b475f9360842a1704050a12ece8e1477a3006cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:21:39 +0900
Subject: [PATCH 378/709] Ensure skin `InstantiationInfo` is updated when
 saving

---
 osu.Game/Skinning/SkinImporter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index f270abd163..701dcdfc2d 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -232,6 +232,9 @@ namespace osu.Game.Skinning
         {
             skin.SkinInfo.PerformWrite(s =>
             {
+                // Update for safety
+                s.InstantiationInfo = skin.GetType().GetInvariantInstantiationInfo();
+
                 // Serialise out the SkinInfo itself.
                 string skinInfoJson = JsonConvert.SerializeObject(s, new JsonSerializerSettings { Formatting = Formatting.Indented });
 

From 1c4e02fae8db6e16a58f26c99c4238626d3b4d13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Sep 2022 23:58:42 +0900
Subject: [PATCH 379/709] Explicitly order default skins in dropdown to get
 correct order

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 4787b07af8..f1a00dc958 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -78,8 +78,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
             realmSubscription = realm.RegisterForNotifications(_ => realm.Realm.All<SkinInfo>()
                                                                          .Where(s => !s.DeletePending)
-                                                                         .OrderByDescending(s => s.Protected) // protected skins should be at the top.
-                                                                         .ThenBy(s => s.Name, StringComparer.OrdinalIgnoreCase), skinsChanged);
+                                                                         .OrderBy(s => s.Name, StringComparer.OrdinalIgnoreCase), skinsChanged);
 
             skinDropdown.Current.BindValueChanged(skin =>
             {
@@ -101,14 +100,17 @@ namespace osu.Game.Overlays.Settings.Sections
             if (!sender.Any())
                 return;
 
-            int protectedCount = sender.Count(s => s.Protected);
-
             // For simplicity repopulate the full list.
             // In the future we should change this to properly handle ChangeSet events.
             dropdownItems.Clear();
-            foreach (var skin in sender)
+
+            dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.DEFAULT_SKIN_TRIANGLES).ToLive(realm));
+            dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.CLASSIC_SKIN).ToLive(realm));
+
+            dropdownItems.Add(random_skin_info);
+
+            foreach (var skin in sender.Where(s => !s.Protected))
                 dropdownItems.Add(skin.ToLive(realm));
-            dropdownItems.Insert(protectedCount, random_skin_info);
 
             Schedule(() => skinDropdown.Items = dropdownItems);
         }

From 41e69fbca69bd23f824660c883bf6d50f5e3e0eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Sep 2022 00:14:49 +0900
Subject: [PATCH 380/709] Remove "default" prefix from naming

---
 .../TestSceneCatchSkinConfiguration.cs                 |  2 +-
 .../Editor/TestSceneManiaComposeScreen.cs              |  2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs  |  2 +-
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs              |  4 ++--
 .../Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs   |  2 +-
 .../Visual/Navigation/TestSceneEditDefaultSkin.cs      |  4 ++--
 osu.Game/Configuration/OsuConfigManager.cs             |  2 +-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs     |  2 +-
 .../Screens/Backgrounds/BackgroundScreenDefault.cs     |  2 +-
 osu.Game/Skinning/RulesetSkinProvidingContainer.cs     |  2 +-
 osu.Game/Skinning/SkinInfo.cs                          |  4 ++--
 osu.Game/Skinning/SkinManager.cs                       | 10 +++++-----
 osu.Game/Skinning/SkinnableSprite.cs                   |  2 +-
 .../{DefaultSkinTriangles.cs => TrianglesSkin.cs}      | 10 +++++-----
 osu.Game/Tests/Visual/SkinnableTestScene.cs            |  6 +++---
 15 files changed, 28 insertions(+), 28 deletions(-)
 rename osu.Game/Skinning/{DefaultSkinTriangles.cs => TrianglesSkin.cs} (95%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
index 06235d3744..a4b2b26624 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
         }
 
-        private class TestSkin : DefaultSkinTriangles
+        private class TestSkin : TrianglesSkin
         {
             public bool FlipCatcherPlate { get; set; }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
index 9e02424eb8..e96a186ae4 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestDefaultSkin()
         {
-            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged());
+            AddStep("set default skin", () => skins.CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged());
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index d3f58ca868..57734236da 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkinTriangles(null))
+            Child = new SkinProvidingContainer(new TrianglesSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 57f2578200..d87bee0d05 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Skins.IO
             skinManager.CurrentSkinInfo.Value.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
-                Assert.AreEqual(typeof(DefaultSkinTriangles), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(TrianglesSkin), s.CreateInstance(skinManager).GetType());
 
                 new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
 
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Skins.IO
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
-                Assert.AreEqual(typeof(DefaultSkinTriangles), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(TrianglesSkin), s.CreateInstance(skinManager).GetType());
             });
 
             return Task.CompletedTask;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index b24a65820d..01cc856a4a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestEmptyLegacyBeatmapSkinFallsBack()
         {
-            CreateSkinTest(DefaultSkinTriangles.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
+            CreateSkinTest(TrianglesSkin.CreateInfo(), () => new LegacyBeatmapSkin(new BeatmapInfo(), null));
             AddUntilStep("wait for hud load", () => Player.ChildrenOfType<SkinnableTargetContainer>().All(c => c.ComponentsLoaded));
             AddAssert("hud from default skin", () => AssertComponentsFromExpectedSource(SkinnableTarget.MainHUDComponents, skinManager.CurrentSkin.Value));
         }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
index bc6458b62b..3757c49f18 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestEditDefaultSkin()
         {
-            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.DEFAULT_SKIN_TRIANGLES);
+            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.TRIANGLES_SKIN);
 
             AddStep("open settings", () => { Game.Settings.Show(); });
 
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("open skin editor", () => skinEditor.Show());
 
             // Until step required as the skin editor may take time to load (and an extra scheduled frame for the mutable part).
-            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.DEFAULT_SKIN_TRIANGLES);
+            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.TRIANGLES_SKIN);
             AddAssert("is not protected", () => skinManager.CurrentSkinInfo.Value.PerformRead(s => !s.Protected));
 
             AddUntilStep("export button enabled", () => Game.Settings.ChildrenOfType<SkinSection.ExportSkinButton>().SingleOrDefault()?.Enabled.Value == true);
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index ec97508522..54c545e367 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Configuration
         {
             // UI/selection defaults
             SetDefault(OsuSetting.Ruleset, string.Empty);
-            SetDefault(OsuSetting.Skin, SkinInfo.DEFAULT_SKIN_TRIANGLES.ToString());
+            SetDefault(OsuSetting.Skin, SkinInfo.TRIANGLES_SKIN.ToString());
 
             SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
             SetDefault(OsuSetting.BeatmapDetailModsFilter, false);
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index f1a00dc958..8d491a980a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // In the future we should change this to properly handle ChangeSet events.
             dropdownItems.Clear();
 
-            dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.DEFAULT_SKIN_TRIANGLES).ToLive(realm));
+            dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.TRIANGLES_SKIN).ToLive(realm));
             dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.CLASSIC_SKIN).ToLive(realm));
 
             dropdownItems.Add(random_skin_info);
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index e04e6d4849..dbc4e2b2e1 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Backgrounds
 
                     case BackgroundSource.Skin:
                         // default skins should use the default background rotation, which won't be the case if a SkinBackground is created for them.
-                        if (skin.Value is DefaultSkinTriangles || skin.Value is DefaultLegacySkin)
+                        if (skin.Value is TrianglesSkin || skin.Value is DefaultLegacySkin)
                             break;
 
                         newBackground = new SkinBackground(skin.Value, getBackgroundTextureName());
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index 9ece48a6cb..4c35681f66 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Skinning
                 }
             }
 
-            int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<DefaultSkinTriangles>().LastOrDefault());
+            int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<TrianglesSkin>().LastOrDefault());
 
             // Ruleset resources should be given the ability to override game-wide defaults
             // This is achieved by placing them before the last instance of DefaultSkin.
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 9e268fd7ec..63f3fd12d1 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
     [JsonObject(MemberSerialization.OptIn)]
     public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
     {
-        internal static readonly Guid DEFAULT_SKIN_TRIANGLES = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
+        internal static readonly Guid TRIANGLES_SKIN = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
         internal static readonly Guid CLASSIC_SKIN = new Guid("81F02CD3-EEC6-4865-AC23-FAE26A386187");
         internal static readonly Guid RANDOM_SKIN = new Guid("D39DFEFB-477C-4372-B1EA-2BCEA5FB8908");
 
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning
                 // This defaults to triangles to catch the case where a user has a modified triangles skin.
                 // If we ever add more default skins in the future this will need some kind of proper migration rather than
                 // a single catch.
-                return new DefaultSkinTriangles(this, resources);
+                return new TrianglesSkin(this, resources);
             }
         }
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index bce58424d4..20af72e4f6 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -49,9 +49,9 @@ namespace osu.Game.Skinning
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>();
 
-        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged())
+        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(TrianglesSkin.CreateInfo().ToLiveUnmanaged())
         {
-            Default = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged()
+            Default = TrianglesSkin.CreateInfo().ToLiveUnmanaged()
         };
 
         private readonly SkinImporter skinImporter;
@@ -86,7 +86,7 @@ namespace osu.Game.Skinning
             var defaultSkins = new[]
             {
                 DefaultLegacySkin = new DefaultLegacySkin(this),
-                DefaultSkinTriangles = new DefaultSkinTriangles(this),
+                DefaultSkinTriangles = new TrianglesSkin(this),
             };
 
             // Ensure the default entries are present.
@@ -125,7 +125,7 @@ namespace osu.Game.Skinning
 
                 if (randomChoices.Length == 0)
                 {
-                    CurrentSkinInfo.Value = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged();
+                    CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged();
                     return;
                 }
 
@@ -294,7 +294,7 @@ namespace osu.Game.Skinning
                 Guid currentUserSkin = CurrentSkinInfo.Value.ID;
 
                 if (items.Any(s => s.ID == currentUserSkin))
-                    scheduler.Add(() => CurrentSkinInfo.Value = Skinning.DefaultSkinTriangles.CreateInfo().ToLiveUnmanaged());
+                    scheduler.Add(() => CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged());
 
                 Delete(items.ToList(), silent);
             });
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index cb4a91691e..69454de979 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Skinning
 
                 // Temporarily used to exclude undesirable ISkin implementations
                 static bool isUserSkin(ISkin skin)
-                    => skin.GetType() == typeof(DefaultSkinTriangles)
+                    => skin.GetType() == typeof(TrianglesSkin)
                        || skin.GetType() == typeof(DefaultLegacySkin)
                        || skin.GetType() == typeof(LegacySkin);
             }
diff --git a/osu.Game/Skinning/DefaultSkinTriangles.cs b/osu.Game/Skinning/TrianglesSkin.cs
similarity index 95%
rename from osu.Game/Skinning/DefaultSkinTriangles.cs
rename to osu.Game/Skinning/TrianglesSkin.cs
index 02df247c36..2c70963524 100644
--- a/osu.Game/Skinning/DefaultSkinTriangles.cs
+++ b/osu.Game/Skinning/TrianglesSkin.cs
@@ -22,26 +22,26 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class DefaultSkinTriangles : Skin
+    public class TrianglesSkin : Skin
     {
         public static SkinInfo CreateInfo() => new SkinInfo
         {
-            ID = osu.Game.Skinning.SkinInfo.DEFAULT_SKIN_TRIANGLES,
+            ID = osu.Game.Skinning.SkinInfo.TRIANGLES_SKIN,
             Name = "osu! \"triangles\" (2017)",
             Creator = "team osu!",
             Protected = true,
-            InstantiationInfo = typeof(DefaultSkinTriangles).GetInvariantInstantiationInfo()
+            InstantiationInfo = typeof(TrianglesSkin).GetInvariantInstantiationInfo()
         };
 
         private readonly IStorageResourceProvider resources;
 
-        public DefaultSkinTriangles(IStorageResourceProvider resources)
+        public TrianglesSkin(IStorageResourceProvider resources)
             : this(CreateInfo(), resources)
         {
         }
 
         [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
-        public DefaultSkinTriangles(SkinInfo skin, IStorageResourceProvider resources)
+        public TrianglesSkin(SkinInfo skin, IStorageResourceProvider resources)
             : base(skin, resources)
         {
             this.resources = resources;
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 21ecdf7dbe..0299a45238 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual
     public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
         private Skin metricsSkin;
-        private Skin defaultSkinTriangles;
+        private Skin trianglesSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual
             var dllStore = new DllResourceStore(GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
-            defaultSkinTriangles = new DefaultLegacySkin(this);
+            trianglesSkin = new DefaultLegacySkin(this);
             specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
             oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual
 
             Cell(0).Child = createProvider(null, creationFunction, beatmap);
             Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
-            Cell(2).Child = createProvider(defaultSkinTriangles, creationFunction, beatmap);
+            Cell(2).Child = createProvider(trianglesSkin, creationFunction, beatmap);
             Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
             Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
         }

From 9a10ecb3789630bd3715ce5e38ffd2cfe5bc1b24 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Sep 2022 19:37:30 +0300
Subject: [PATCH 381/709] Clarify purpose of `APIUserScoreAggregate`

---
 .../Online/API/Requests/Responses/APIUserScoreAggregate.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
index 30433ab8cd..c870157fec 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
@@ -10,6 +10,9 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
+    /// <summary>
+    /// Represents an aggregate score for a user based off all beatmaps that have been played in the playlist.
+    /// </summary>
     public class APIUserScoreAggregate
     {
         [JsonProperty("attempts")]

From 3c7ea5c8fadbc0348f5f84304c2872ff1d831a64 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 18:57:09 +0200
Subject: [PATCH 382/709] Update

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 osu.Game/Screens/Edit/EditorBeatmap.cs                        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 9e96a7386d..721f0c4e3b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 defaultTimelineZoom = getZoomLevelForVisibleMilliseconds(6000);
 
-                float initialZoom = (float)(defaultTimelineZoom * editorBeatmap.BeatmapInfo.TimelineZoom);
+                float initialZoom = (float)(defaultTimelineZoom * (editorBeatmap.BeatmapInfo.TimelineZoom == 0 ? 1 : editorBeatmap.BeatmapInfo.TimelineZoom));
                 float minimumZoom = getZoomLevelForVisibleMilliseconds(10000);
                 float maximumZoom = getZoomLevelForVisibleMilliseconds(500);
 
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 356276039c..16c0064e80 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -96,7 +96,6 @@ namespace osu.Game.Screens.Edit
             PlayableBeatmap.ControlPointInfo = ConvertControlPoints(PlayableBeatmap.ControlPointInfo);
 
             this.beatmapInfo = beatmapInfo ?? playableBeatmap.BeatmapInfo;
-            if (this.beatmapInfo.TimelineZoom <= 0) this.beatmapInfo.TimelineZoom = 1;
 
             if (beatmapSkin is Skin skin)
             {

From c8768eb39919c649556a4bb508f1bbde4863a765 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 19:00:50 +0200
Subject: [PATCH 383/709] Changed == to <= on TimelineZoom check

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 721f0c4e3b..09fa2c8cee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 defaultTimelineZoom = getZoomLevelForVisibleMilliseconds(6000);
 
-                float initialZoom = (float)(defaultTimelineZoom * (editorBeatmap.BeatmapInfo.TimelineZoom == 0 ? 1 : editorBeatmap.BeatmapInfo.TimelineZoom));
+                float initialZoom = (float)(defaultTimelineZoom * (editorBeatmap.BeatmapInfo.TimelineZoom <= 0 ? 1 : editorBeatmap.BeatmapInfo.TimelineZoom));
                 float minimumZoom = getZoomLevelForVisibleMilliseconds(10000);
                 float maximumZoom = getZoomLevelForVisibleMilliseconds(500);
 

From 9d94343317a00d8cf122b88baf7757cd4c584fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Vaj=C4=8F=C3=A1k?= <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 19:51:44 +0200
Subject: [PATCH 384/709] Update
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 09fa2c8cee..721f0c4e3b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 defaultTimelineZoom = getZoomLevelForVisibleMilliseconds(6000);
 
-                float initialZoom = (float)(defaultTimelineZoom * (editorBeatmap.BeatmapInfo.TimelineZoom <= 0 ? 1 : editorBeatmap.BeatmapInfo.TimelineZoom));
+                float initialZoom = (float)(defaultTimelineZoom * (editorBeatmap.BeatmapInfo.TimelineZoom == 0 ? 1 : editorBeatmap.BeatmapInfo.TimelineZoom));
                 float minimumZoom = getZoomLevelForVisibleMilliseconds(10000);
                 float maximumZoom = getZoomLevelForVisibleMilliseconds(500);
 

From c075d3de08accdd9f49d1e347a3aad4b6607a078 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 22:43:40 +0200
Subject: [PATCH 385/709] Create a test and a check if initial zoom value of
 ZoomableScrollContainer is in range

---
 .../Editing/TestSceneZoomableScrollContainer.cs     | 13 +++++++++++++
 .../Components/Timeline/ZoomableScrollContainer.cs  |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index ce418f33f0..1858aee76b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -66,6 +67,18 @@ namespace osu.Game.Tests.Visual.Editing
             AddUntilStep("Scroll container is loaded", () => scrollContainer.LoadState >= LoadState.Loaded);
         }
 
+        [Test]
+        public void TestInitialZoomOutOfRange()
+        {
+            AddStep("Invalid ZoomableScrollContainer throws ArgumentException", () =>
+            {
+                Assert.Throws<ArgumentException>(() =>
+                {
+                    _ = new ZoomableScrollContainer(1, 60, 0);
+                });
+            });
+        }
+
         [Test]
         public void TestWidthInitialization()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7d51284f46..0fb59a8a1f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (minimum > maximum)
                 throw new ArgumentException($"{nameof(minimum)} ({minimum}) must be less than {nameof(maximum)} ({maximum})");
 
+            if (initial < minimum || initial > maximum)
+                throw new ArgumentException($"{nameof(initial)} ({initial}) must be between {nameof(minimum)} ({minimum}) and {nameof(maximum)} ({maximum})");
+
             minZoom = minimum;
             maxZoom = maximum;
             CurrentZoom = zoomTarget = initial;

From beef3b418ad1e1ba4023a55348992f69e40fbcde Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sat, 17 Sep 2022 23:41:23 -0400
Subject: [PATCH 386/709] Simplifies size calculation

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 558605efc3..a34e55faae 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -50,6 +50,11 @@ namespace osu.Game.Rulesets.Mods
         where T : HitObject
     {
         public const double FLASHLIGHT_FADE_DURATION = 800;
+
+        private const int flashlight_size_decrease_combo = 100;
+        private const int last_flashlight_size_decrease_combo = 200;
+        private const float decrease_flashlight_with_combo_multiplier = 0.1f;
+
         protected readonly BindableInt Combo = new BindableInt();
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -147,16 +152,12 @@ namespace osu.Game.Rulesets.Mods
             protected float GetSizeFor(int combo)
             {
                 float size = defaultFlashlightSize * sizeMultiplier;
+                int comboForSize = Math.Min(combo, last_flashlight_size_decrease_combo);
 
-                if (comboBasedSize)
-                {
-                    if (combo > 200)
-                        size *= 0.8f;
-                    else if (combo > 100)
-                        size *= 0.9f;
-                }
+                if (!comboBasedSize)
+                    comboForSize = 0;
 
-                return size;
+                return size * (1 - decrease_flashlight_with_combo_multiplier * MathF.Floor(MathF.Min(comboForSize, last_flashlight_size_decrease_combo) / flashlight_size_decrease_combo));
             }
 
             private Vector2 flashlightPosition;

From 8464a1941bef4c47a949a1c935bdc58aa2b8791f Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sat, 17 Sep 2022 23:49:23 -0400
Subject: [PATCH 387/709] Use linq expression for handling breaks

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index a34e55faae..f43f54541d 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -132,13 +133,8 @@ namespace osu.Game.Rulesets.Mods
 
                 using (BeginAbsoluteSequence(0))
                 {
-                    foreach (var breakPeriod in Breaks)
+                    foreach (BreakPeriod breakPeriod in Breaks.Where(breakPeriod => breakPeriod.HasEffect && breakPeriod.Duration >= FLASHLIGHT_FADE_DURATION * 2))
                     {
-                        if (!breakPeriod.HasEffect)
-                            continue;
-
-                        if (breakPeriod.Duration < FLASHLIGHT_FADE_DURATION * 2) continue;
-
                         this.Delay(breakPeriod.StartTime + FLASHLIGHT_FADE_DURATION).FadeOutFromOne(FLASHLIGHT_FADE_DURATION);
                         this.Delay(breakPeriod.EndTime - FLASHLIGHT_FADE_DURATION).FadeInFromZero(FLASHLIGHT_FADE_DURATION);
                     }

From 3b87ecf56c0f473b7081bad10e715825becbc6b8 Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sun, 18 Sep 2022 00:18:17 -0400
Subject: [PATCH 388/709] renames variables to make more logical sense

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index f43f54541d..4d24bdfa02 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -53,8 +53,8 @@ namespace osu.Game.Rulesets.Mods
         public const double FLASHLIGHT_FADE_DURATION = 800;
 
         private const int flashlight_size_decrease_combo = 100;
-        private const int last_flashlight_size_decrease_combo = 200;
-        private const float decrease_flashlight_with_combo_multiplier = 0.1f;
+        private const int flashlight_size_decrease_combo_max = 200;
+        private const float flashlight_size_decrease_with_combo_multiplier = 0.1f;
 
         protected readonly BindableInt Combo = new BindableInt();
 
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Mods
 
                 using (BeginAbsoluteSequence(0))
                 {
-                    foreach (BreakPeriod breakPeriod in Breaks.Where(breakPeriod => breakPeriod.HasEffect && breakPeriod.Duration >= FLASHLIGHT_FADE_DURATION * 2))
+                    foreach (var breakPeriod in Breaks.Where(breakPeriod => breakPeriod.HasEffect && breakPeriod.Duration >= FLASHLIGHT_FADE_DURATION * 2))
                     {
                         this.Delay(breakPeriod.StartTime + FLASHLIGHT_FADE_DURATION).FadeOutFromOne(FLASHLIGHT_FADE_DURATION);
                         this.Delay(breakPeriod.EndTime - FLASHLIGHT_FADE_DURATION).FadeInFromZero(FLASHLIGHT_FADE_DURATION);
@@ -148,12 +148,12 @@ namespace osu.Game.Rulesets.Mods
             protected float GetSizeFor(int combo)
             {
                 float size = defaultFlashlightSize * sizeMultiplier;
-                int comboForSize = Math.Min(combo, last_flashlight_size_decrease_combo);
+                int comboForSize = Math.Min(combo, flashlight_size_decrease_combo_max);
 
                 if (!comboBasedSize)
                     comboForSize = 0;
 
-                return size * (1 - decrease_flashlight_with_combo_multiplier * MathF.Floor(MathF.Min(comboForSize, last_flashlight_size_decrease_combo) / flashlight_size_decrease_combo));
+                return size * (1 - flashlight_size_decrease_with_combo_multiplier * MathF.Floor(MathF.Min(comboForSize, flashlight_size_decrease_combo_max) / flashlight_size_decrease_combo));
             }
 
             private Vector2 flashlightPosition;

From ac4229e3d4654b07758617e6c274d7cde550caad Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sun, 18 Sep 2022 00:38:01 -0400
Subject: [PATCH 389/709] Removes overhead when not combo based size

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 4d24bdfa02..490f9120b1 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -148,12 +148,11 @@ namespace osu.Game.Rulesets.Mods
             protected float GetSizeFor(int combo)
             {
                 float size = defaultFlashlightSize * sizeMultiplier;
-                int comboForSize = Math.Min(combo, flashlight_size_decrease_combo_max);
 
-                if (!comboBasedSize)
-                    comboForSize = 0;
+                if (comboBasedSize)
+                    size *= 1 - flashlight_size_decrease_with_combo_multiplier * MathF.Floor(MathF.Min(combo, flashlight_size_decrease_combo_max) / flashlight_size_decrease_combo);
 
-                return size * (1 - flashlight_size_decrease_with_combo_multiplier * MathF.Floor(MathF.Min(comboForSize, flashlight_size_decrease_combo_max) / flashlight_size_decrease_combo));
+                return size;
             }
 
             private Vector2 flashlightPosition;

From 2dcaf7cfd8ee9294cc6c7162d01520f24e9e0691 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Sun, 18 Sep 2022 14:25:31 +0900
Subject: [PATCH 390/709] Fix memory leak due to missing event unbind

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 1f80c47d13..5a297f18db 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -110,6 +110,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (Client != null)
             {
                 Client.RoomUpdated -= invokeOnRoomUpdated;
+                Client.LoadRequested -= invokeOnRoomLoadRequested;
                 Client.UserLeft -= invokeUserLeft;
                 Client.UserKicked -= invokeUserKicked;
                 Client.UserJoined -= invokeUserJoined;

From d0b8409de5418fec79d0b21c64ce0d2c25ff3357 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Sep 2022 18:18:10 +0900
Subject: [PATCH 391/709] Apply more renames

---
 .../Skinning/Legacy/LegacyHitExplosion.cs          |  2 +-
 .../TestSceneCursorParticles.cs                    |  2 +-
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs          |  2 +-
 .../Visual/Gameplay/TestSceneParticleSpewer.cs     |  2 +-
 osu.Game/Skinning/SkinManager.cs                   | 14 +++++++-------
 osu.Game/Tests/Visual/SkinnableTestScene.cs        | 10 ++++++----
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs
index 0630de9156..8f46bdbe6e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyHitExplosion.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(SkinManager skins)
         {
-            var defaultLegacySkin = skins.DefaultLegacySkin;
+            var defaultLegacySkin = skins.DefaultClassicSkin;
 
             // sprite names intentionally swapped to match stable member naming / ease of cross-referencing
             explosion1.Texture = defaultLegacySkin.GetTexture("scoreboard-explosion-2");
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs
index b5d1c4854c..7f0ecaca2b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorParticles.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
             AddStep("setup default legacy skin", () =>
             {
-                skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo;
+                skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
             });
         });
     }
diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index d87bee0d05..3cbc205eaf 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Tests.Skins.IO
         {
             var skinManager = osu.Dependencies.Get<SkinManager>();
 
-            skinManager.CurrentSkinInfo.Value = skinManager.DefaultLegacySkin.SkinInfo;
+            skinManager.CurrentSkinInfo.Value = skinManager.DefaultClassicSkin.SkinInfo;
 
             skinManager.EnsureMutableSkin();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
index 26706d9465..66441c8bad 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private TestParticleSpewer createSpewer() =>
-            new TestParticleSpewer(skinManager.DefaultLegacySkin.GetTexture("star2"))
+            new TestParticleSpewer(skinManager.DefaultClassicSkin.GetTexture("star2"))
             {
                 Origin = Anchor.Centre,
                 RelativePositionAxes = Axes.Both,
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 20af72e4f6..a9a01dfebf 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -59,14 +59,14 @@ namespace osu.Game.Skinning
         private readonly IResourceStore<byte[]> userFiles;
 
         /// <summary>
-        /// The default skin.
+        /// The default "triangles" skin.
         /// </summary>
         public Skin DefaultSkinTriangles { get; }
 
         /// <summary>
-        /// The default legacy skin.
+        /// The default "classic" skin.
         /// </summary>
-        public Skin DefaultLegacySkin { get; }
+        public Skin DefaultClassicSkin { get; }
 
         public SkinManager(Storage storage, RealmAccess realm, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler)
             : base(storage, realm)
@@ -85,7 +85,7 @@ namespace osu.Game.Skinning
 
             var defaultSkins = new[]
             {
-                DefaultLegacySkin = new DefaultLegacySkin(this),
+                DefaultClassicSkin = new DefaultLegacySkin(this),
                 DefaultSkinTriangles = new TrianglesSkin(this),
             };
 
@@ -229,8 +229,8 @@ namespace osu.Game.Skinning
             {
                 yield return CurrentSkin.Value;
 
-                if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultLegacySkin)
-                    yield return DefaultLegacySkin;
+                if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultClassicSkin)
+                    yield return DefaultClassicSkin;
 
                 if (CurrentSkin.Value != DefaultSkinTriangles)
                     yield return DefaultSkinTriangles;
@@ -310,7 +310,7 @@ namespace osu.Game.Skinning
             if (skinInfo == null)
             {
                 if (guid == SkinInfo.CLASSIC_SKIN)
-                    skinInfo = DefaultLegacySkin.SkinInfo;
+                    skinInfo = DefaultClassicSkin.SkinInfo;
             }
 
             CurrentSkinInfo.Value = skinInfo ?? DefaultSkinTriangles.SkinInfo;
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 0299a45238..75224742a2 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -29,8 +29,9 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
+        private TrianglesSkin trianglesSkin;
         private Skin metricsSkin;
-        private Skin trianglesSkin;
+        private Skin legacySkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
@@ -47,8 +48,9 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(GetType().Assembly);
 
+            trianglesSkin = new TrianglesSkin(this);
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
-            trianglesSkin = new DefaultLegacySkin(this);
+            legacySkin = new DefaultLegacySkin(this);
             specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
             oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
@@ -61,9 +63,9 @@ namespace osu.Game.Tests.Visual
 
             var beatmap = CreateBeatmapForSkinProvider();
 
-            Cell(0).Child = createProvider(null, creationFunction, beatmap);
+            Cell(0).Child = createProvider(trianglesSkin, creationFunction, beatmap);
             Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
-            Cell(2).Child = createProvider(trianglesSkin, creationFunction, beatmap);
+            Cell(2).Child = createProvider(legacySkin, creationFunction, beatmap);
             Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
             Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
         }

From 6a06a5b1b5476deb96e8e405cbd83fef66071b48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Sep 2022 18:20:28 +0900
Subject: [PATCH 392/709] Reword fallback instantiation handling comment to
 hopefully explain things better

---
 osu.Game/Skinning/SkinInfo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 63f3fd12d1..34728245c8 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -53,7 +53,8 @@ namespace osu.Game.Skinning
             }
             catch
             {
-                // This defaults to triangles to catch the case where a user has a modified triangles skin.
+                // Since the class was renamed from "DefaultSkin" to "TrianglesSkin", the instantiation would fail
+                // for user modified skins. This aims to amicably handle that.
                 // If we ever add more default skins in the future this will need some kind of proper migration rather than
                 // a single catch.
                 return new TrianglesSkin(this, resources);

From 0ac28cbecc2c58d4acdb614fe291b42bf3d291b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Sep 2022 23:42:16 +0900
Subject: [PATCH 393/709] Fix potential crash from missing `DownloadProgress`

---
 .../Multiplayer/Participants/StateDisplay.cs      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 9c05c19d1b..ecef7509d9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -1,10 +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.
 
-#nullable disable
-
 using System;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -25,9 +22,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
     {
         private const double fade_time = 50;
 
-        private SpriteIcon icon;
-        private OsuSpriteText text;
-        private ProgressBar progressBar;
+        private SpriteIcon icon = null!;
+        private OsuSpriteText text = null!;
+        private ProgressBar progressBar = null!;
 
         public StateDisplay()
         {
@@ -86,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             };
         }
 
-        private OsuColour colours;
+        private OsuColour colours = null!;
 
         public void UpdateStatus(MultiplayerUserState state, BeatmapAvailability availability)
         {
@@ -164,10 +161,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     break;
 
                 case DownloadState.Downloading:
-                    Debug.Assert(availability.DownloadProgress != null);
-
                     progressBar.FadeIn(fade_time);
-                    progressBar.CurrentTime = availability.DownloadProgress.Value;
+                    progressBar.CurrentTime = availability.DownloadProgress ?? 0;
 
                     text.Text = "downloading map";
                     icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;

From 6d7d80a4fbb09f2f89d82bfc3366b71d3d06b259 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sun, 18 Sep 2022 17:29:08 +0200
Subject: [PATCH 394/709] Made X position value of CatchHitObject clamp to
 CatchPlayfield's width

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6e01c44e1f..c6d63f6b81 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         [JsonIgnore]
         public float X
         {
-            set => originalX.Value = value;
+            set => originalX.Value = Math.Clamp(value, 0, CatchPlayfield.WIDTH);
         }
 
         private HitObjectProperty<float> xOffset;

From 493efd84a3900f4c439887f5db931fb699d143f7 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 12:08:34 -0700
Subject: [PATCH 395/709] Basic smoke path implementation

---
 osu.Game.Rulesets.Osu/OsuInputManager.cs      |   5 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |   1 +
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |   1 +
 .../Skinning/Default/DefaultSmoke.cs          |  14 ++
 .../Skinning/Legacy/LegacySmoke.cs            |  26 ++++
 .../Legacy/OsuLegacySkinTransformer.cs        |   6 +
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs       | 131 ++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |   2 +
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    |  57 ++++++++
 9 files changed, 242 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Smoke.cs
 create mode 100644 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index 12256e93d0..dec965e567 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Rulesets.Osu
         LeftButton,
 
         [Description("Right button")]
-        RightButton
+        RightButton,
+
+        [Description("Smoke")]
+        Smoke,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 302194e91a..76465fe3d5 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Rulesets.Osu
         {
             new KeyBinding(InputKey.Z, OsuAction.LeftButton),
             new KeyBinding(InputKey.X, OsuAction.RightButton),
+            new KeyBinding(InputKey.C, OsuAction.Smoke),
             new KeyBinding(InputKey.MouseLeft, OsuAction.LeftButton),
             new KeyBinding(InputKey.MouseRight, OsuAction.RightButton),
         };
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index fcf079b6aa..11daa26072 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerBody,
+        Smoke,
         ApproachCircle,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
new file mode 100644
index 0000000000..3c798c2afa
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -0,0 +1,14 @@
+// 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.
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public class DefaultSmoke : Smoke
+    {
+        public DefaultSmoke()
+        {
+            Texture = null;
+            PathRadius = 2;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
new file mode 100644
index 0000000000..9494d31a63
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -0,0 +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 osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
+{
+    public class LegacySmoke : Smoke
+    {
+        private ISkin skin;
+
+        public LegacySmoke(ISkin skin)
+        {
+            this.skin = skin;
+
+            PathRadius = 8;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Texture = skin.GetTexture("cursor-smoke");
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 885a2c12fb..a9186f821e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -106,6 +106,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                         return null;
 
+                    case OsuSkinComponents.Smoke:
+                        if (GetTexture("cursor-smoke") != null)
+                            return new LegacySmoke(this);
+
+                        return null;
+
                     case OsuSkinComponents.HitCircleText:
                         if (!this.HasFont(LegacyFont.HitCircle))
                             return null;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
new file mode 100644
index 0000000000..6c60392c94
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -0,0 +1,131 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Lines;
+using osu.Game.Rulesets.Osu.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public abstract class Smoke : TexturedPath
+    {
+        protected bool IsActive { get; private set; }
+        protected double SmokeTimeStart { get; private set; } = double.MinValue;
+        protected double SmokeTimeEnd { get; private set; } = double.MinValue;
+
+        protected readonly List<Vector2> SmokeVertexPositions = new List<Vector2>();
+        protected readonly List<double> SmokeVertexTimes = new List<double>();
+
+        [Resolved(CanBeNull = true)]
+        private SmokeContainer? smokeContainer { get; set; }
+
+        protected struct SmokePoint
+        {
+            public Vector2 Position;
+            public double Time;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (smokeContainer != null)
+            {
+                smokeContainer.SmokeMoved += guardOnSmokeMoved;
+                smokeContainer.SmokeEnded += guardOnSmokeEnded;
+                IsActive = true;
+            }
+
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+
+            SmokeTimeStart = Time.Current;
+        }
+
+        private void guardOnSmokeMoved(Vector2 position, double time)
+        {
+            if (IsActive)
+                OnSmokeMoved(position, time);
+        }
+
+        private void guardOnSmokeEnded(double time)
+        {
+            if (IsActive)
+                OnSmokeEnded(time);
+        }
+
+        protected virtual void OnSmokeMoved(Vector2 position, double time)
+        {
+            addSmokeVertex(position, time);
+        }
+
+        private void addSmokeVertex(Vector2 position, double time)
+        {
+            Debug.Assert(SmokeVertexTimes.Count == SmokeVertexPositions.Count);
+
+            if (SmokeVertexTimes.Count > 0 && SmokeVertexTimes.Last() > time)
+            {
+                int index = ~SmokeVertexTimes.BinarySearch(time, new UpperBoundComparer());
+
+                SmokeVertexTimes.RemoveRange(index, SmokeVertexTimes.Count - index);
+                SmokeVertexPositions.RemoveRange(index, SmokeVertexPositions.Count - index);
+            }
+
+            SmokeVertexTimes.Add(time);
+            SmokeVertexPositions.Add(position);
+        }
+
+        protected virtual void OnSmokeEnded(double time)
+        {
+            IsActive = false;
+            SmokeTimeEnd = time;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            const double visible_duration = 8000;
+            const float disappear_speed = 3;
+
+            int index = 0;
+            if (!IsActive)
+            {
+                double cutoffTime = SmokeTimeStart + disappear_speed * (Time.Current - (SmokeTimeEnd + visible_duration));
+                index = ~SmokeVertexTimes.BinarySearch(cutoffTime, new UpperBoundComparer());
+            }
+            Vertices = new List<Vector2>(SmokeVertexPositions.Skip(index));
+
+            Position = -PositionInBoundingBox(Vector2.Zero);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (smokeContainer != null)
+            {
+                smokeContainer.SmokeMoved -= guardOnSmokeMoved;
+                smokeContainer.SmokeEnded -= guardOnSmokeEnded;
+            }
+        }
+
+        private struct UpperBoundComparer : IComparer<double>
+        {
+            public int Compare(double x, double target)
+            {
+                // By returning -1 when the target value is equal to x, guarantees that the
+                // element at BinarySearch's returned index will always be the first element
+                // larger. Since 0 is never returned, the target is never "found", so the return
+                // value will be the index's complement.
+
+                return x > target ? 1 : -1;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index fc2ba8ea2f..8085c07912 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.UI
     public class OsuPlayfield : Playfield
     {
         private readonly PlayfieldBorder playfieldBorder;
+        private readonly SmokeContainer smokeContainer;
         private readonly ProxyContainer approachCircles;
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
@@ -54,6 +55,7 @@ namespace osu.Game.Rulesets.Osu.UI
             InternalChildren = new Drawable[]
             {
                 playfieldBorder = new PlayfieldBorder { RelativeSizeAxes = Axes.Both },
+                smokeContainer = new SmokeContainer { RelativeSizeAxes = Axes.Both },
                 spinnerProxies = new ProxyContainer { RelativeSizeAxes = Axes.Both },
                 FollowPoints = new FollowPointRenderer { RelativeSizeAxes = Axes.Both },
                 judgementLayer = new JudgementContainer<DrawableOsuJudgement> { RelativeSizeAxes = Axes.Both },
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
new file mode 100644
index 0000000000..865204f8cc
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -0,0 +1,57 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    [Cached]
+    public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
+    {
+        public event Action<Vector2, double>? SmokeMoved;
+        public event Action<double>? SmokeEnded;
+
+        private bool isSmoking = false;
+
+        public override bool ReceivePositionalInputAt(Vector2 _) => true;
+
+        public bool OnPressed(KeyBindingPressEvent<OsuAction> e)
+        {
+            if (e.Action == OsuAction.Smoke)
+            {
+                isSmoking = true;
+                AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.Smoke), _ => new DefaultSmoke()));
+
+                return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
+        {
+            if (e.Action == OsuAction.Smoke)
+            {
+                isSmoking = false;
+                SmokeEnded?.Invoke(Time.Current);
+            }
+        }
+
+        protected override bool OnMouseMove(MouseMoveEvent e)
+        {
+            if (isSmoking)
+                SmokeMoved?.Invoke(e.MousePosition, Time.Current);
+
+            return base.OnMouseMove(e);
+        }
+    }
+}

From 613564b5b9ecdb56953aa093982b3c22a565f8e4 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 12:10:01 -0700
Subject: [PATCH 396/709] Full legacy smoke implementation and temp default
 smoke

---
 .../Skinning/Default/DefaultSmoke.cs          |  51 +-
 .../Skinning/Legacy/LegacySmoke.cs            |  93 +++-
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs       | 443 +++++++++++++++---
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    |   1 -
 4 files changed, 521 insertions(+), 67 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 3c798c2afa..ecba9d4904 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -1,14 +1,61 @@
 // 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Rendering;
+using osuTK.Graphics;
+
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class DefaultSmoke : Smoke
     {
+        private const double fade_out_delay = 8000;
+        private const double fade_out_speed = 3;
+        private const double fade_out_duration = 50;
+        private const float alpha = 0.5f;
+
+        protected override double LifetimeAfterSmokeEnd => fade_out_delay + fade_out_duration + (SmokeEndTime - SmokeStartTime) / fade_out_speed;
+
         public DefaultSmoke()
         {
-            Texture = null;
-            PathRadius = 2;
+            Radius = 2;
+        }
+
+        protected override DrawNode CreateDrawNode() => new DefaultSmokeDrawNode(this);
+
+        private class DefaultSmokeDrawNode : SmokeDrawNode
+        {
+            private double fadeOutTime;
+
+            public DefaultSmokeDrawNode(ITexturedShaderDrawable source)
+                : base(source)
+            {
+            }
+
+            protected override void UpdateDrawVariables(IRenderer renderer)
+            {
+                base.UpdateDrawVariables(renderer);
+
+                fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
+            }
+
+            protected override Color4 ColorAtTime(double pointTime)
+            {
+                var color = Color4.White;
+                color.A = alpha;
+
+                double timeDoingFadeOut = fadeOutTime - pointTime;
+                if (timeDoingFadeOut > 0)
+                {
+                    float fraction = Math.Clamp((float)(1 - (timeDoingFadeOut / fade_out_duration)), 0, 1);
+                    fraction = MathF.Pow(fraction, 5);
+                    color.A *= fraction;
+                }
+
+                return color;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 9494d31a63..6c2c80f746 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -1,19 +1,42 @@
 // 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Rendering;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacySmoke : Smoke
     {
+        private const double initial_fade_out_duration = 2500;
+
+        private const double re_fade_in_speed = 3;
+        private const double re_fade_in_duration = 50;
+
+        private const double final_fade_out_duration = 7500;
+
+        private const float initial_alpha = 0.8f;
+        private const float re_fade_in_alpha = 1.4f;
+
+        protected override double LifetimeAfterSmokeEnd
+        {
+            get
+            {
+                double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+                return final_fade_out_duration + initialFadeOutDurationTrunc * (1 + re_fade_in_speed);
+            }
+        }
+
         private ISkin skin;
 
         public LegacySmoke(ISkin skin)
         {
             this.skin = skin;
-
-            PathRadius = 8;
+            Radius = 3;
         }
 
         protected override void LoadComplete()
@@ -22,5 +45,71 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             Texture = skin.GetTexture("cursor-smoke");
         }
+
+        protected override DrawNode CreateDrawNode() => new LegacySmokeDrawNode(this);
+
+        protected class LegacySmokeDrawNode : SmokeDrawNode
+        {
+            private double initialFadeOutDurationTrunc;
+            private double initialFadeOutTime;
+            private double reFadeInTime;
+            private double finalFadeOutTime;
+
+            public LegacySmokeDrawNode(ITexturedShaderDrawable source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+            }
+
+            protected override void UpdateDrawVariables(IRenderer renderer)
+            {
+                base.UpdateDrawVariables(renderer);
+
+                initialFadeOutTime = Math.Min(CurrentTime, SmokeEndTime);
+                reFadeInTime = re_fade_in_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc;
+                finalFadeOutTime = CurrentTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
+            }
+
+            protected override Color4 ColorAtTime(double pointTime)
+            {
+                var color = Color4.White;
+
+                double timeDoingInitialFadeOut = initialFadeOutTime - pointTime;
+
+                if (timeDoingInitialFadeOut > 0)
+                {
+                    float fraction = Math.Clamp((float)(timeDoingInitialFadeOut / initial_fade_out_duration), 0, 1);
+                    fraction = MathF.Pow(fraction, 5);
+                    color.A = (1 - fraction) * initial_alpha;
+                }
+
+                if (color.A > 0)
+                {
+                    double timeDoingReFadeIn = reFadeInTime - pointTime;
+                    double timeDoingFinalFadeOut = finalFadeOutTime - pointTime;
+
+                    if (timeDoingFinalFadeOut > 0)
+                    {
+                        float fraction = Math.Clamp((float)(timeDoingFinalFadeOut / final_fade_out_duration), 0, 1);
+                        fraction = MathF.Pow(fraction, 5);
+                        color.A = (1 - fraction) * re_fade_in_alpha;
+                    }
+                    else if (timeDoingReFadeIn > 0)
+                    {
+                        float fraction = Math.Clamp((float)(timeDoingReFadeIn / re_fade_in_duration), 0, 1);
+                        fraction = 1 - MathF.Pow(1 - fraction, 5);
+                        color.A = fraction * (re_fade_in_alpha - color.A) + color.A;
+                    }
+                }
+
+                return color;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 6c60392c94..52de537098 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -1,33 +1,175 @@
 // 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.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Lines;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Rendering.Vertices;
+using osu.Framework.Graphics.Shaders;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
-    public abstract class Smoke : TexturedPath
+    public abstract class Smoke : Drawable, ITexturedShaderDrawable
     {
-        protected bool IsActive { get; private set; }
-        protected double SmokeTimeStart { get; private set; } = double.MinValue;
-        protected double SmokeTimeEnd { get; private set; } = double.MinValue;
+        public IShader? TextureShader { get; private set; }
+        public IShader? RoundedTextureShader { get; private set; }
 
-        protected readonly List<Vector2> SmokeVertexPositions = new List<Vector2>();
-        protected readonly List<double> SmokeVertexTimes = new List<double>();
+        private float radius = 1;
+        protected float Radius
+        {
+            get => radius;
+            set
+            {
+                if (radius == value)
+                    return;
+
+                radius = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+
+        private int rotationSeed = RNG.Next();
+        protected int RotationSeed
+        {
+            get => rotationSeed;
+            set
+            {
+                if (rotationSeed == value)
+                    return;
+
+                rotationSeed = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+        private Texture? texture;
+        protected Texture? Texture
+        {
+            get => texture;
+            set
+            {
+                texture = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+        private double smokeTimeStart = double.MinValue;
+        protected double SmokeStartTime
+        {
+            get => smokeTimeStart;
+            private set
+            {
+                if (smokeTimeStart == value)
+                    return;
+
+                smokeTimeStart = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+        private double smokeTimeEnd = double.MaxValue;
+        protected double SmokeEndTime
+        {
+            get => smokeTimeEnd;
+            private set
+            {
+                if (smokeTimeEnd == value)
+                    return;
+
+                smokeTimeEnd = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+        public override IFrameBasedClock Clock
+        {
+            get => base.Clock;
+            set
+            {
+                base.Clock = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
+
+        private Vector2 topLeft;
+        protected Vector2 TopLeft
+        {
+            get => topLeft;
+            set
+            {
+                if (topLeft == value)
+                    return;
+
+                topLeft = value;
+                Invalidate(Invalidation.All);
+            }
+        }
+
+        private Vector2 bottomRight;
+        protected Vector2 BottomRight
+        {
+            get => bottomRight;
+            set
+            {
+                if (bottomRight == value)
+                    return;
+
+                bottomRight = value;
+                Invalidate(Invalidation.Layout);
+            }
+        }
+
+        protected abstract double LifetimeAfterSmokeEnd { get; }
+        protected virtual float PointInterval => Radius * 7f / 8;
+        protected bool IsActive { get; private set; }
+
+        protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
+
+        private float totalDistance;
+        private Vector2? lastPosition = null;
+
+        private const double max_duration = 60_000;
+
+        public override float Height
+        {
+            get => base.Height = BottomRight.Y - TopLeft.Y;
+            set => throw new InvalidOperationException($"Cannot manually set {nameof(Height)} of {nameof(Smoke)}.");
+        }
+
+        public override float Width
+        {
+            get => base.Width = BottomRight.X - TopLeft.X;
+            set => throw new InvalidOperationException($"Cannot manually set {nameof(Width)} of {nameof(Smoke)}.");
+        }
+
+        public override Vector2 Size
+        {
+            get => base.Size = BottomRight - TopLeft;
+            set => throw new InvalidOperationException($"Cannot manually set {nameof(Size)} of {nameof(Smoke)}.");
+        }
 
         [Resolved(CanBeNull = true)]
         private SmokeContainer? smokeContainer { get; set; }
 
-        protected struct SmokePoint
+        [BackgroundDependencyLoader]
+        private void load(ShaderManager shaders)
         {
-            public Vector2 Position;
-            public double Time;
+            RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
+            TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE);
         }
 
         protected override void LoadComplete()
@@ -36,72 +178,107 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             if (smokeContainer != null)
             {
-                smokeContainer.SmokeMoved += guardOnSmokeMoved;
-                smokeContainer.SmokeEnded += guardOnSmokeEnded;
+                smokeContainer.SmokeMoved += onSmokeMoved;
+                smokeContainer.SmokeEnded += onSmokeEnded;
                 IsActive = true;
             }
 
             Anchor = Anchor.TopLeft;
             Origin = Anchor.TopLeft;
 
-            SmokeTimeStart = Time.Current;
+            SmokeStartTime = Time.Current;
         }
 
-        private void guardOnSmokeMoved(Vector2 position, double time)
+        private void onSmokeMoved(Vector2 position, double time)
         {
-            if (IsActive)
-                OnSmokeMoved(position, time);
-        }
+            if (!IsActive)
+                return;
 
-        private void guardOnSmokeEnded(double time)
-        {
-            if (IsActive)
-                OnSmokeEnded(time);
-        }
+            lastPosition ??= position;
 
-        protected virtual void OnSmokeMoved(Vector2 position, double time)
-        {
-            addSmokeVertex(position, time);
-        }
+            float delta = (position - (Vector2)lastPosition).LengthFast;
+            totalDistance += delta;
+            int count = (int)(totalDistance / PointInterval);
 
-        private void addSmokeVertex(Vector2 position, double time)
-        {
-            Debug.Assert(SmokeVertexTimes.Count == SmokeVertexPositions.Count);
-
-            if (SmokeVertexTimes.Count > 0 && SmokeVertexTimes.Last() > time)
+            if (count > 0)
             {
-                int index = ~SmokeVertexTimes.BinarySearch(time, new UpperBoundComparer());
+                Vector2 increment = position - (Vector2)lastPosition;
+                increment.NormalizeFast();
 
-                SmokeVertexTimes.RemoveRange(index, SmokeVertexTimes.Count - index);
-                SmokeVertexPositions.RemoveRange(index, SmokeVertexPositions.Count - index);
+                Vector2 pointPos = (PointInterval - (totalDistance - delta)) * increment + (Vector2)lastPosition;
+                increment *= PointInterval;
+
+                if (SmokePoints.Count > 0 && SmokePoints[^1].Time > time)
+                {
+                    int index = ~SmokePoints.BinarySearch(new SmokePoint { Time = time }, new SmokePoint.UpperBoundComparer());
+                    SmokePoints.RemoveRange(index, SmokePoints.Count - index);
+                    recalculateBounds();
+                }
+
+                totalDistance %= PointInterval;
+                for (int i = 0; i < count; i++)
+                {
+                    SmokePoints.Add(new SmokePoint
+                    {
+                        Position = pointPos,
+                        Time = time,
+                    });
+
+                    pointPos += increment;
+                }
+
+                Invalidate(Invalidation.DrawNode);
+                adaptBounds(position);
             }
 
-            SmokeVertexTimes.Add(time);
-            SmokeVertexPositions.Add(position);
+            lastPosition = position;
+
+            if (time - SmokeStartTime > max_duration)
+                onSmokeEnded(time);
         }
 
-        protected virtual void OnSmokeEnded(double time)
+        private void recalculateBounds()
         {
-            IsActive = false;
-            SmokeTimeEnd = time;
+            TopLeft = BottomRight = Vector2.Zero;
+
+            foreach (var point in SmokePoints)
+                adaptBounds(point.Position);
         }
 
+        private void adaptBounds(Vector2 position)
+        {
+            if (position.X < TopLeft.X)
+                TopLeft = new Vector2(position.X, TopLeft.Y);
+            else if (position.X > BottomRight.X)
+                BottomRight = new Vector2(position.X, BottomRight.Y);
+
+            if (position.Y < TopLeft.Y)
+                TopLeft = new Vector2(TopLeft.X, position.Y);
+            else if (position.Y > BottomRight.Y)
+                BottomRight = new Vector2(BottomRight.X, position.Y);
+        }
+
+        private void onSmokeEnded(double time)
+        {
+            if (!IsActive)
+                return;
+
+            IsActive = false;
+            SmokeEndTime = time;
+            LifetimeEnd = time + LifetimeAfterSmokeEnd + 100;
+
+            // TODO: HYPER MEGA JANK WTF??
+            if (Parent is SkinnableDrawable)
+                Parent.LifetimeEnd = LifetimeEnd;
+        }
+
+        protected abstract override DrawNode CreateDrawNode();
+
         protected override void Update()
         {
             base.Update();
 
-            const double visible_duration = 8000;
-            const float disappear_speed = 3;
-
-            int index = 0;
-            if (!IsActive)
-            {
-                double cutoffTime = SmokeTimeStart + disappear_speed * (Time.Current - (SmokeTimeEnd + visible_duration));
-                index = ~SmokeVertexTimes.BinarySearch(cutoffTime, new UpperBoundComparer());
-            }
-            Vertices = new List<Vector2>(SmokeVertexPositions.Skip(index));
-
-            Position = -PositionInBoundingBox(Vector2.Zero);
+            Position = TopLeft;
         }
 
         protected override void Dispose(bool isDisposing)
@@ -110,21 +287,163 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             if (smokeContainer != null)
             {
-                smokeContainer.SmokeMoved -= guardOnSmokeMoved;
-                smokeContainer.SmokeEnded -= guardOnSmokeEnded;
+                smokeContainer.SmokeMoved -= onSmokeMoved;
+                smokeContainer.SmokeEnded -= onSmokeEnded;
             }
         }
 
-        private struct UpperBoundComparer : IComparer<double>
+        protected struct SmokePoint
         {
-            public int Compare(double x, double target)
-            {
-                // By returning -1 when the target value is equal to x, guarantees that the
-                // element at BinarySearch's returned index will always be the first element
-                // larger. Since 0 is never returned, the target is never "found", so the return
-                // value will be the index's complement.
+            public Vector2 Position;
+            public double Time;
 
-                return x > target ? 1 : -1;
+            public struct UpperBoundComparer : IComparer<SmokePoint>
+            {
+                public int Compare(SmokePoint x, SmokePoint target)
+                {
+                    // By returning -1 when the target value is equal to x, guarantees that the
+                    // element at BinarySearch's returned index will always be the first element
+                    // larger. Since 0 is never returned, the target is never "found", so the return
+                    // value will be the index's complement.
+
+                    return x.Time > target.Time ? 1 : -1;
+                }
+            }
+        }
+
+        protected abstract class SmokeDrawNode : TexturedShaderDrawNode
+        {
+            protected new Smoke Source => (Smoke)base.Source;
+
+            protected IVertexBatch<TexturedVertex2D>? QuadBatch;
+
+            protected readonly List<SmokePoint> Points = new List<SmokePoint>();
+
+            protected float Radius;
+            protected Vector2 DrawSize;
+            protected Vector2 PositionOffset;
+            protected Texture? Texture;
+
+            protected double SmokeStartTime;
+            protected double SmokeEndTime;
+            protected double CurrentTime;
+
+            protected RectangleF TextureRect;
+
+            private IFrameBasedClock? clock;
+
+            private int rotationSeed;
+            private Random rotationRNG = new Random();
+
+            public SmokeDrawNode(ITexturedShaderDrawable source)
+                : base(source)
+            {
+            }
+
+            public override void ApplyState()
+            {
+                base.ApplyState();
+
+                Points.Clear();
+                Points.AddRange(Source.SmokePoints);
+
+                Radius = Source.Radius;
+                DrawSize = Source.DrawSize;
+                PositionOffset = Source.TopLeft;
+                Texture = Source.Texture;
+                clock = Source.Clock;
+
+                SmokeStartTime = Source.SmokeStartTime;
+                SmokeEndTime = Source.SmokeEndTime;
+
+                rotationSeed = Source.RotationSeed;
+            }
+
+            public sealed override void Draw(IRenderer renderer)
+            {
+                base.Draw(renderer);
+
+                if (Points.Count == 0)
+                    return;
+
+                QuadBatch ??= renderer.CreateQuadBatch<TexturedVertex2D>(7200, 10);
+                Texture ??= renderer.WhitePixel;
+
+                var shader = GetAppropriateShader(renderer);
+                shader.Bind();
+                Texture.Bind();
+
+                UpdateDrawVariables(renderer);
+                UpdateVertexBuffer();
+
+                shader.Unbind();
+            }
+
+            protected Color4 ColorAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
+                ? ((SRGBColour)DrawColourInfo.Colour).Linear
+                : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
+
+            protected abstract Color4 ColorAtTime(double pointTime);
+
+            protected virtual void UpdateDrawVariables(IRenderer renderer)
+            {
+                Debug.Assert(clock != null);
+                Debug.Assert(Texture != null);
+
+                CurrentTime = clock.CurrentTime;
+                TextureRect = Texture.GetTextureRect();
+                rotationRNG = new Random(rotationSeed);
+            }
+
+            protected virtual void UpdateVertexBuffer()
+            {
+                foreach (var point in Points)
+                    drawPointQuad(point);
+            }
+
+            private Vector2 nextTextureDirection()
+            {
+                float angle = (float)rotationRNG.NextDouble() * 2 * MathF.PI;
+                return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
+            }
+
+            private void drawPointQuad(SmokePoint point)
+            {
+                Debug.Assert(QuadBatch != null);
+
+                var color = ColorAtTime(point.Time);
+                var dir = nextTextureDirection();
+                var ortho = dir.PerpendicularLeft;
+
+                var localTopLeft = point.Position + (Radius * (-ortho - dir)) - PositionOffset;
+                var localTopRight = point.Position + (Radius * (-ortho + dir)) - PositionOffset;
+                var localBotLeft = point.Position + (Radius * (ortho - dir)) - PositionOffset;
+                var localBotRight = point.Position + (Radius * (ortho + dir)) - PositionOffset;
+
+                QuadBatch.Add(new TexturedVertex2D
+                {
+                    Position = Vector2Extensions.Transform(localTopLeft, DrawInfo.Matrix),
+                    TexturePosition = TextureRect.TopLeft,
+                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopLeft), color),
+                });
+                QuadBatch.Add(new TexturedVertex2D
+                {
+                    Position = Vector2Extensions.Transform(localTopRight, DrawInfo.Matrix),
+                    TexturePosition = TextureRect.TopRight,
+                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopRight), color),
+                });
+                QuadBatch.Add(new TexturedVertex2D
+                {
+                    Position = Vector2Extensions.Transform(localBotRight, DrawInfo.Matrix),
+                    TexturePosition = TextureRect.BottomRight,
+                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotRight), color),
+                });
+                QuadBatch.Add(new TexturedVertex2D
+                {
+                    Position = Vector2Extensions.Transform(localBotLeft, DrawInfo.Matrix),
+                    TexturePosition = TextureRect.BottomLeft,
+                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color),
+                });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 865204f8cc..b8897f2cf1 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;

From ca9fe9f24000b40ef60422867d82ed25b0fd6e16 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sun, 18 Sep 2022 22:05:09 +0200
Subject: [PATCH 397/709] Fixed TestCatcherCatchWidth failing

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 956d0e0c14..11fa751daf 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -108,14 +108,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             float halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth + 1 });
-                attemptCatch(new Fruit { X = halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth - 1 });
-                attemptCatch(new Fruit { X = halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
             });
             checkPlate(2);
         }

From 4263933c9e4431afd2c085a7d40aa256c241eb22 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Sun, 18 Sep 2022 23:43:14 +0200
Subject: [PATCH 398/709] Add settings `AngleSharpness` and `Angle variety`

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 52 +++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 056a325dce..fca42dedee 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -4,9 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
@@ -25,6 +28,26 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTarget)).ToArray();
 
+        [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(SettingsSlider<float>))]
+        public BindableFloat AngleSharpness { get; } = new BindableFloat
+        {
+            Default = 7,
+            Value = 7,
+            MinValue = 1,
+            MaxValue = 10,
+            Precision = 0.1f
+        };
+
+        [SettingSource("Angle variety", "The amount of variety in how sharp angles are", SettingControlType = typeof(SettingsSlider<float>))]
+        public BindableFloat AngleVariety { get; } = new BindableFloat
+        {
+            Default = 3,
+            Value = 3,
+            MinValue = 0,
+            MaxValue = 10,
+            Precision = 0.1f
+        };
+
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
 
         private Random random = null!;
@@ -50,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             {
                 if (shouldStartNewSection(osuBeatmap, positionInfos, i))
                 {
-                    sectionOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.0008f);
+                    sectionOffset = getRandomOffset(0.0008f);
                     flowDirection = !flowDirection;
                 }
 
@@ -65,11 +88,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                     float flowChangeOffset = 0;
 
                     // Offsets only the angle of the current hit object.
-                    float oneTimeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
+                    float oneTimeOffset = getRandomOffset(0.002f);
 
                     if (shouldApplyFlowChange(positionInfos, i))
                     {
-                        flowChangeOffset = OsuHitObjectGenerationUtils.RandomGaussian(random, 0, 0.002f);
+                        flowChangeOffset = getRandomOffset(0.002f);
                         flowDirection = !flowDirection;
                     }
 
@@ -86,13 +109,32 @@ namespace osu.Game.Rulesets.Osu.Mods
             osuBeatmap.HitObjects = OsuHitObjectGenerationUtils.RepositionHitObjects(positionInfos);
         }
 
+        private float getRandomOffset(float stdDev)
+        {
+            float customMultiplier = AngleVariety.Value / AngleVariety.Default;
+            return OsuHitObjectGenerationUtils.RandomGaussian(random, 0, stdDev * customMultiplier);
+        }
+
         /// <param name="targetDistance">The target distance between the previous and the current <see cref="OsuHitObject"/>.</param>
         /// <param name="offset">The angle (in rad) by which the target angle should be offset.</param>
         /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
-        private static float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
+        private float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310))) + 0.5 + offset);
+            // Range 0..1
+            float angleSharpness = AngleSharpness.Value / AngleSharpness.MaxValue;
+            float angleWideness = 1 - angleSharpness;
+
+            // Range: -70..30
+            float customOffsetX = angleSharpness * 100 - 70;
+            // Range: -0.075..0.175
+            float customOffsetY = angleWideness * 0.25f - 0.075f;
+
+            targetDistance += customOffsetX;
+            float angle = (float)(2.16 / (1 + 200 * Math.Exp(0.036 * (targetDistance - 310 + customOffsetX))) + 0.5);
+            angle += offset + customOffsetY;
+
             float relativeAngle = (float)Math.PI - angle;
+
             return flowDirection ? -relativeAngle : relativeAngle;
         }
 

From 9eb0a21d753b80082937d6abe82ae9c4d8be5ce6 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Mon, 19 Sep 2022 00:45:23 +0200
Subject: [PATCH 399/709] Correct comments

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index fca42dedee..c829d1f696 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -120,13 +120,14 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
         private float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            // Range 0..1
+            // Range [0.1;1]
             float angleSharpness = AngleSharpness.Value / AngleSharpness.MaxValue;
+            // Range [0;0.9]
             float angleWideness = 1 - angleSharpness;
 
-            // Range: -70..30
+            // Range: [-60;30]
             float customOffsetX = angleSharpness * 100 - 70;
-            // Range: -0.075..0.175
+            // Range: [-0.075;0.15]
             float customOffsetY = angleWideness * 0.25f - 0.075f;
 
             targetDistance += customOffsetX;

From 407b104116c45f99d21d9cd9bde842d5984b8178 Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sun, 18 Sep 2022 18:55:47 -0400
Subject: [PATCH 400/709] Revert changes

This reverts commit beef3b418ad1e1ba4023a55348992f69e40fbcde.

Revert "Use linq expression for handling breaks"

This reverts commit 8464a1941bef4c47a949a1c935bdc58aa2b8791f.

Revert "renames variables to make more logical sense"

This reverts commit 3b87ecf56c0f473b7081bad10e715825becbc6b8.

Revert "Removes overhead when not combo based size"

This reverts commit ac4229e3d4654b07758617e6c274d7cde550caad.
---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 490f9120b1..558605efc3 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -51,11 +50,6 @@ namespace osu.Game.Rulesets.Mods
         where T : HitObject
     {
         public const double FLASHLIGHT_FADE_DURATION = 800;
-
-        private const int flashlight_size_decrease_combo = 100;
-        private const int flashlight_size_decrease_combo_max = 200;
-        private const float flashlight_size_decrease_with_combo_multiplier = 0.1f;
-
         protected readonly BindableInt Combo = new BindableInt();
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@@ -133,8 +127,13 @@ namespace osu.Game.Rulesets.Mods
 
                 using (BeginAbsoluteSequence(0))
                 {
-                    foreach (var breakPeriod in Breaks.Where(breakPeriod => breakPeriod.HasEffect && breakPeriod.Duration >= FLASHLIGHT_FADE_DURATION * 2))
+                    foreach (var breakPeriod in Breaks)
                     {
+                        if (!breakPeriod.HasEffect)
+                            continue;
+
+                        if (breakPeriod.Duration < FLASHLIGHT_FADE_DURATION * 2) continue;
+
                         this.Delay(breakPeriod.StartTime + FLASHLIGHT_FADE_DURATION).FadeOutFromOne(FLASHLIGHT_FADE_DURATION);
                         this.Delay(breakPeriod.EndTime - FLASHLIGHT_FADE_DURATION).FadeInFromZero(FLASHLIGHT_FADE_DURATION);
                     }
@@ -150,7 +149,12 @@ namespace osu.Game.Rulesets.Mods
                 float size = defaultFlashlightSize * sizeMultiplier;
 
                 if (comboBasedSize)
-                    size *= 1 - flashlight_size_decrease_with_combo_multiplier * MathF.Floor(MathF.Min(combo, flashlight_size_decrease_combo_max) / flashlight_size_decrease_combo);
+                {
+                    if (combo > 200)
+                        size *= 0.8f;
+                    else if (combo > 100)
+                        size *= 0.9f;
+                }
 
                 return size;
             }

From a4e9c7711c4b042101d6499a8b30d5fe27bf567c Mon Sep 17 00:00:00 2001
From: O Thiago <odasher896@gmail.com>
Date: Sun, 18 Sep 2022 18:59:17 -0400
Subject: [PATCH 401/709] Fix when flashlight shrinking takes place

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 558605efc3..6d7706cde2 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -150,9 +150,9 @@ namespace osu.Game.Rulesets.Mods
 
                 if (comboBasedSize)
                 {
-                    if (combo > 200)
+                    if (combo >= 200)
                         size *= 0.8f;
-                    else if (combo > 100)
+                    else if (combo >= 100)
                         size *= 0.9f;
                 }
 

From 06178104c8953a059f5f26b3b04a5e8978ed551b Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 17:55:06 -0700
Subject: [PATCH 402/709] Show smoke in replays

---
 osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs | 3 +++
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
index 85060261fe..8082c5aef4 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuReplayFrame.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Rulesets.Osu.Replays
             Position = currentFrame.Position;
             if (currentFrame.MouseLeft) Actions.Add(OsuAction.LeftButton);
             if (currentFrame.MouseRight) Actions.Add(OsuAction.RightButton);
+            if (currentFrame.Smoke) Actions.Add(OsuAction.Smoke);
         }
 
         public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
@@ -41,6 +42,8 @@ namespace osu.Game.Rulesets.Osu.Replays
                 state |= ReplayButtonState.Left1;
             if (Actions.Contains(OsuAction.RightButton))
                 state |= ReplayButtonState.Right1;
+            if (Actions.Contains(OsuAction.Smoke))
+                state |= ReplayButtonState.Smoke;
 
             return new LegacyReplayFrame(Time, Position.X, Position.Y, state);
         }
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index f6abf259e8..f345504ca1 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
@@ -46,6 +46,10 @@ namespace osu.Game.Replays.Legacy
         [IgnoreMember]
         public bool MouseRight2 => ButtonState.HasFlagFast(ReplayButtonState.Right2);
 
+        [JsonIgnore]
+        [IgnoreMember]
+        public bool Smoke => ButtonState.HasFlagFast(ReplayButtonState.Smoke);
+
         [Key(3)]
         public ReplayButtonState ButtonState;
 

From 0138663bdcb3d534dd892a68f545f310eb2dfe4d Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 18:32:33 -0700
Subject: [PATCH 403/709] Fix InspectCode errors

---
 .../Skinning/Default/DefaultSmoke.cs              |  2 +-
 .../Skinning/Legacy/LegacySmoke.cs                |  3 +--
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs           | 15 +++++++++++----
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs          |  3 +--
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs        |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index ecba9d4904..e7f526da31 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Rendering;
 using osuTK.Graphics;
@@ -47,6 +46,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 color.A = alpha;
 
                 double timeDoingFadeOut = fadeOutTime - pointTime;
+
                 if (timeDoingFadeOut > 0)
                 {
                     float fraction = Math.Clamp((float)(1 - (timeDoingFadeOut / fade_out_duration)), 0, 1);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 6c2c80f746..23ab2d186f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Rendering;
 using osu.Game.Skinning;
@@ -31,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             }
         }
 
-        private ISkin skin;
+        private readonly ISkin skin;
 
         public LegacySmoke(ISkin skin)
         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 52de537098..382e54e2ab 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -28,6 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public IShader? RoundedTextureShader { get; private set; }
 
         private float radius = 1;
+
         protected float Radius
         {
             get => radius;
@@ -41,8 +42,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
-
         private int rotationSeed = RNG.Next();
+
         protected int RotationSeed
         {
             get => rotationSeed;
@@ -57,6 +58,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         private Texture? texture;
+
         protected Texture? Texture
         {
             get => texture;
@@ -68,6 +70,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         private double smokeTimeStart = double.MinValue;
+
         protected double SmokeStartTime
         {
             get => smokeTimeStart;
@@ -82,6 +85,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         private double smokeTimeEnd = double.MaxValue;
+
         protected double SmokeEndTime
         {
             get => smokeTimeEnd;
@@ -106,6 +110,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         }
 
         private Vector2 topLeft;
+
         protected Vector2 TopLeft
         {
             get => topLeft;
@@ -115,11 +120,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     return;
 
                 topLeft = value;
-                Invalidate(Invalidation.All);
+                Invalidate();
             }
         }
 
         private Vector2 bottomRight;
+
         protected Vector2 BottomRight
         {
             get => bottomRight;
@@ -140,7 +146,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
 
         private float totalDistance;
-        private Vector2? lastPosition = null;
+        private Vector2? lastPosition;
 
         private const double max_duration = 60_000;
 
@@ -216,6 +222,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
 
                 totalDistance %= PointInterval;
+
                 for (int i = 0; i < count; i++)
                 {
                     SmokePoints.Add(new SmokePoint
@@ -335,7 +342,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             private int rotationSeed;
             private Random rotationRNG = new Random();
 
-            public SmokeDrawNode(ITexturedShaderDrawable source)
+            protected SmokeDrawNode(ITexturedShaderDrawable source)
                 : base(source)
             {
             }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 8085c07912..2e67e91460 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Rulesets.Osu.UI
     public class OsuPlayfield : Playfield
     {
         private readonly PlayfieldBorder playfieldBorder;
-        private readonly SmokeContainer smokeContainer;
         private readonly ProxyContainer approachCircles;
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
@@ -55,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
             InternalChildren = new Drawable[]
             {
                 playfieldBorder = new PlayfieldBorder { RelativeSizeAxes = Axes.Both },
-                smokeContainer = new SmokeContainer { RelativeSizeAxes = Axes.Both },
+                new SmokeContainer { RelativeSizeAxes = Axes.Both },
                 spinnerProxies = new ProxyContainer { RelativeSizeAxes = Axes.Both },
                 FollowPoints = new FollowPointRenderer { RelativeSizeAxes = Axes.Both },
                 judgementLayer = new JudgementContainer<DrawableOsuJudgement> { RelativeSizeAxes = Axes.Both },
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index b8897f2cf1..07a073c3e5 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.UI
         public event Action<Vector2, double>? SmokeMoved;
         public event Action<double>? SmokeEnded;
 
-        private bool isSmoking = false;
+        private bool isSmoking;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
 

From 6852577dad463994280fbd8a171f4f6098b1bdd1 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 19:08:01 -0700
Subject: [PATCH 404/709] Remove smoke from key overlay

---
 osu.Game.Rulesets.Osu/OsuInputManager.cs    | 15 +++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index dec965e567..6500ade7ea 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -10,6 +10,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu
 {
@@ -56,6 +57,20 @@ namespace osu.Game.Rulesets.Osu
             return base.HandleMouseTouchStateChange(e);
         }
 
+        public override void Attach(KeyCounterDisplay keyCounter)
+        {
+            var receptor = new ActionReceptor(keyCounter);
+
+            KeyBindingContainer.Add(receptor);
+
+            keyCounter.SetReceptor(receptor);
+            keyCounter.AddRange(new[]
+            {
+                new KeyCounterAction<OsuAction>(OsuAction.LeftButton),
+                new KeyCounterAction<OsuAction>(OsuAction.RightButton),
+            });
+        }
+
         private class OsuKeyBindingContainer : RulesetKeyBindingContainer
         {
             public bool AllowUserPresses = true;
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 7c37913576..902579d9d2 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.UI
 
         #region Key Counter Attachment
 
-        public void Attach(KeyCounterDisplay keyCounter)
+        public virtual void Attach(KeyCounterDisplay keyCounter)
         {
             var receptor = new ActionReceptor(keyCounter);
 

From 454125123d3aa7a0e06b179b519eb8d67cab1576 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 11:31:38 +0900
Subject: [PATCH 405/709] Add failing test coverage showing mod reference leak
 path

---
 .../TestScenePlayerLocalScoreImport.cs        | 33 +++++++++++++++++++
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 12 ++++---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index 247b822dc3..db9d2bfc1d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -15,8 +15,10 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -101,6 +103,37 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for last played to update", () => getLastPlayed() != null);
         }
 
+        [Test]
+        public void TestModReferenceNotRetained()
+        {
+            AddStep("allow fail", () => allowFail = false);
+
+            Mod[] originalMods = { new OsuModDaycore { SpeedChange = { Value = 0.8 } } };
+            Mod[] playerMods = null!;
+
+            AddStep($"Load player with mods", () => LoadPlayer(originalMods));
+            AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
+
+            AddStep("get mods at start of gameplay", () => playerMods = Player.Score.ScoreInfo.Mods.ToArray());
+
+            // Player creates new instance of mods during load.
+            AddAssert("player score has copied mods", () => playerMods.First(), () => Is.Not.SameAs(originalMods.First()));
+            AddAssert("player score has matching mods", () => playerMods.First(), () => Is.EqualTo(originalMods.First()));
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+
+            AddStep("seek to completion", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+
+            AddUntilStep("results displayed", () => Player.GetChildScreen() is ResultsScreen);
+
+            // Player creates new instance of mods after gameplay to ensure any runtime references to drawables etc. are not retained.
+            AddAssert("results screen score has copied mods", () => (Player.GetChildScreen() as ResultsScreen)?.Score.Mods.First(), () => Is.Not.SameAs(playerMods.First()));
+            AddAssert("results screen score has matching", () => (Player.GetChildScreen() as ResultsScreen)?.Score.Mods.First(), () => Is.EqualTo(playerMods.First()));
+
+            AddUntilStep("score in database", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID) != null));
+            AddUntilStep("databased score has correct mods", () => Realm.Run(r => r.Find<ScoreInfo>(Player.Score.ScoreInfo.ID)).Mods.First(), () => Is.EqualTo(playerMods.First()));
+        }
+
         [Test]
         public void TestScoreStoredLocally()
         {
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index a9decbae57..9bad867206 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -7,7 +7,6 @@ using System;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
@@ -57,7 +56,9 @@ namespace osu.Game.Tests.Visual
 
         protected virtual bool Autoplay => false;
 
-        protected void LoadPlayer()
+        protected void LoadPlayer() => LoadPlayer(Array.Empty<Mod>());
+
+        protected void LoadPlayer(Mod[] mods)
         {
             var ruleset = CreatePlayerRuleset();
             Ruleset.Value = ruleset.RulesetInfo;
@@ -65,20 +66,21 @@ namespace osu.Game.Tests.Visual
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
-            SelectedMods.Value = Array.Empty<Mod>();
+
+            SelectedMods.Value = mods;
 
             if (!AllowFail)
             {
                 var noFailMod = ruleset.CreateMod<ModNoFail>();
                 if (noFailMod != null)
-                    SelectedMods.Value = new[] { noFailMod };
+                    SelectedMods.Value = SelectedMods.Value.Append(noFailMod).ToArray();
             }
 
             if (Autoplay)
             {
                 var mod = ruleset.GetAutoplayMod();
                 if (mod != null)
-                    SelectedMods.Value = SelectedMods.Value.Concat(mod.Yield()).ToArray();
+                    SelectedMods.Value = SelectedMods.Value.Append(mod).ToArray();
             }
 
             Player = CreatePlayer(ruleset);

From 0a625bd879d8b525da798f04b00fac1e161515c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Sep 2022 23:48:03 +0900
Subject: [PATCH 406/709] Fix mods potentially keeping reference to runtime
 gameplay elements

As noticed by smoogipoo during multiplayer match on the weekend.
---
 osu.Game/Scoring/ScoreInfo.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 25a7bad9e8..1b36ae176d 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -137,6 +137,11 @@ namespace osu.Game.Scoring
 
             clone.Statistics = new Dictionary<HitResult, int>(clone.Statistics);
             clone.MaximumStatistics = new Dictionary<HitResult, int>(clone.MaximumStatistics);
+
+            // Ensure we have fresh mods to avoid any references (ie. after gameplay).
+            clone.clearAllMods();
+            clone.ModsJson = ModsJson;
+
             clone.RealmUser = new RealmUser
             {
                 OnlineID = RealmUser.OnlineID,

From 2b1c5b2c4a11ffbafbf3fb0361647527de2baaac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 12:34:50 +0900
Subject: [PATCH 407/709] Fix test failure due to triangle skin no longer being
 null intests

---
 .../Visual/Gameplay/SkinnableHUDComponentTestScene.cs        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
index 3ecf560eb1..1bf1bd4c81 100644
--- a/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
@@ -1,12 +1,11 @@
 // 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.
 
-#nullable disable
-
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -19,7 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             SetContents(skin =>
             {
-                var implementation = skin != null
+                var implementation = skin is not TrianglesSkin
                     ? CreateLegacyImplementation()
                     : CreateDefaultImplementation();
 

From 494790294acdd01e3c25127451cc36a08806f329 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 17:43:36 +0900
Subject: [PATCH 408/709] Update `SkinnableTestScene` to show new default skin

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 75224742a2..4ef9a733c4 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Tests.Visual
         private TrianglesSkin trianglesSkin;
         private Skin metricsSkin;
         private Skin legacySkin;
+        private Skin argonSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
@@ -48,6 +49,7 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(GetType().Assembly);
 
+            argonSkin = new ArgonSkin(this);
             trianglesSkin = new TrianglesSkin(this);
             metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
             legacySkin = new DefaultLegacySkin(this);
@@ -63,11 +65,12 @@ namespace osu.Game.Tests.Visual
 
             var beatmap = CreateBeatmapForSkinProvider();
 
-            Cell(0).Child = createProvider(trianglesSkin, creationFunction, beatmap);
-            Cell(1).Child = createProvider(metricsSkin, creationFunction, beatmap);
-            Cell(2).Child = createProvider(legacySkin, creationFunction, beatmap);
-            Cell(3).Child = createProvider(specialSkin, creationFunction, beatmap);
-            Cell(4).Child = createProvider(oldSkin, creationFunction, beatmap);
+            Cell(0).Child = createProvider(argonSkin, creationFunction, beatmap);
+            Cell(1).Child = createProvider(trianglesSkin, creationFunction, beatmap);
+            Cell(2).Child = createProvider(metricsSkin, creationFunction, beatmap);
+            Cell(3).Child = createProvider(legacySkin, creationFunction, beatmap);
+            Cell(4).Child = createProvider(specialSkin, creationFunction, beatmap);
+            Cell(5).Child = createProvider(oldSkin, creationFunction, beatmap);
         }
 
         protected IEnumerable<Drawable> CreatedDrawables => createdDrawables;
@@ -82,10 +85,7 @@ namespace osu.Game.Tests.Visual
             OutlineBox outlineBox;
             SkinProvidingContainer skinProvider;
 
-            ISkin provider = skin;
-
-            if (provider is LegacySkin legacyProvider)
-                provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(legacyProvider, beatmap);
+            ISkin provider = Ruleset.Value.CreateInstance().CreateSkinTransformer(skin, beatmap) ?? skin;
 
             var children = new Container
             {

From f6b29d8ebcaf468d43972ed66ccd605e21438b9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 19:17:54 +0900
Subject: [PATCH 409/709] Make `TestSceneHitCircle` show more than one cirle to
 make testing easier

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index cc69054e23..be224b88ce 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -58,10 +58,11 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private Drawable testSingle(float circleSize, bool auto = false, double timeOffset = 0, Vector2? positionOffset = null)
         {
-            var drawable = createSingle(circleSize, auto, timeOffset, positionOffset);
-
             var playfield = new TestOsuPlayfield();
-            playfield.Add(drawable);
+
+            for (double t = timeOffset; t < timeOffset + 60000; t += 2000)
+                playfield.Add(createSingle(circleSize, auto, t, positionOffset));
+
             return playfield;
         }
 

From a0e31018a18af7eeec7c4608cd5dcce7387d0f99 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 22:06:07 -0700
Subject: [PATCH 410/709] Copy stable smoke's fade/alpha values, blending,
 scale, and rotation

---
 .../Skinning/Default/DefaultSmoke.cs          | 15 +++-
 .../Skinning/Legacy/LegacySmoke.cs            | 83 ++++++++++++++++---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs       | 57 +++++--------
 3 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index e7f526da31..0ba0143466 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Rendering;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
@@ -40,12 +41,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
             }
 
-            protected override Color4 ColorAtTime(double pointTime)
+            protected override Color4 PointColor(SmokePoint point)
             {
                 var color = Color4.White;
                 color.A = alpha;
 
-                double timeDoingFadeOut = fadeOutTime - pointTime;
+                double timeDoingFadeOut = fadeOutTime - point.Time;
 
                 if (timeDoingFadeOut > 0)
                 {
@@ -56,6 +57,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 return color;
             }
+
+            protected override float PointScale(SmokePoint point)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override Vector2 PointDirection(SmokePoint point)
+            {
+                throw new NotImplementedException();
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 23ab2d186f..093d8f87eb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -4,29 +4,59 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Rendering;
+using osu.Framework.Utils;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacySmoke : Smoke
     {
-        private const double initial_fade_out_duration = 2500;
+        // fade values
+        private const double initial_fade_out_duration = 4000;
 
         private const double re_fade_in_speed = 3;
         private const double re_fade_in_duration = 50;
 
-        private const double final_fade_out_duration = 7500;
+        private const double final_fade_out_speed = 2;
+        private const double final_fade_out_duration = 8000;
 
-        private const float initial_alpha = 0.8f;
-        private const float re_fade_in_alpha = 1.4f;
+        private const float initial_alpha = 0.6f;
+        private const float re_fade_in_alpha = 1f;
+
+        // scale values
+        private const double scale_duration = 1200;
+
+        private const float initial_scale = 0.65f;
+        private const float final_scale = 1f;
+
+        // rotation values
+        private const double rotation_duration = 500;
+
+        private const float max_rotation = 0.25f;
+
+        private int rotationSeed = RNG.Next();
+
+        protected int RotationSeed
+        {
+            get => rotationSeed;
+            set
+            {
+                if (rotationSeed == value)
+                    return;
+
+                rotationSeed = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
 
         protected override double LifetimeAfterSmokeEnd
         {
             get
             {
                 double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-                return final_fade_out_duration + initialFadeOutDurationTrunc * (1 + re_fade_in_speed);
+                return final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
             }
         }
 
@@ -49,11 +79,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected class LegacySmokeDrawNode : SmokeDrawNode
         {
+            protected new LegacySmoke Source => (LegacySmoke)base.Source;
+
             private double initialFadeOutDurationTrunc;
             private double initialFadeOutTime;
             private double reFadeInTime;
             private double finalFadeOutTime;
 
+            private int rotationSeed;
+            private Random rotationRNG = new Random();
+
             public LegacySmokeDrawNode(ITexturedShaderDrawable source)
                 : base(source)
             {
@@ -64,34 +99,35 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 base.ApplyState();
 
                 initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+                rotationSeed = Source.RotationSeed;
             }
 
             protected override void UpdateDrawVariables(IRenderer renderer)
             {
                 base.UpdateDrawVariables(renderer);
 
+                rotationRNG = new Random(rotationSeed);
                 initialFadeOutTime = Math.Min(CurrentTime, SmokeEndTime);
                 reFadeInTime = re_fade_in_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc;
-                finalFadeOutTime = CurrentTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
+                finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
             }
 
-            protected override Color4 ColorAtTime(double pointTime)
+            protected override Color4 PointColor(SmokePoint point)
             {
                 var color = Color4.White;
 
-                double timeDoingInitialFadeOut = initialFadeOutTime - pointTime;
+                double timeDoingInitialFadeOut = initialFadeOutTime - point.Time;
 
                 if (timeDoingInitialFadeOut > 0)
                 {
                     float fraction = Math.Clamp((float)(timeDoingInitialFadeOut / initial_fade_out_duration), 0, 1);
-                    fraction = MathF.Pow(fraction, 5);
                     color.A = (1 - fraction) * initial_alpha;
                 }
 
                 if (color.A > 0)
                 {
-                    double timeDoingReFadeIn = reFadeInTime - pointTime;
-                    double timeDoingFinalFadeOut = finalFadeOutTime - pointTime;
+                    double timeDoingReFadeIn = reFadeInTime - point.Time;
+                    double timeDoingFinalFadeOut = finalFadeOutTime - point.Time;
 
                     if (timeDoingFinalFadeOut > 0)
                     {
@@ -109,6 +145,31 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                 return color;
             }
+
+            protected override float PointScale(SmokePoint point)
+            {
+                double timeDoingScale = CurrentTime - point.Time;
+                float fraction = Math.Clamp((float)(timeDoingScale / scale_duration), 0, 1);
+                fraction = 1 - MathF.Pow(1 - fraction, 5);
+                return fraction * (final_scale - initial_scale) + initial_scale;
+            }
+
+            protected override Vector2 PointDirection(SmokePoint point)
+            {
+                float initialAngle = MathF.Atan2(point.Direction.Y, point.Direction.X);
+                float finalAngle = initialAngle + nextRotation();
+
+                double timeDoingRotation = CurrentTime - point.Time;
+                float fraction = Math.Clamp((float)(timeDoingRotation / rotation_duration), 0, 1);
+                fraction = 1 - MathF.Pow(1 - fraction, 5);
+                float angle = fraction * (finalAngle - initialAngle) + initialAngle;
+
+                return toVector2(angle);
+            }
+
+            private float nextRotation() => max_rotation * ((float)rotationRNG.NextDouble() * 2 - 1);
+
+            private Vector2 toVector2(float angle) => new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 382e54e2ab..b725cc028b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -42,21 +42,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
-        private int rotationSeed = RNG.Next();
-
-        protected int RotationSeed
-        {
-            get => rotationSeed;
-            set
-            {
-                if (rotationSeed == value)
-                    return;
-
-                rotationSeed = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
-
         private Texture? texture;
 
         protected Texture? Texture
@@ -195,6 +180,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             SmokeStartTime = Time.Current;
         }
 
+        private Vector2 nextPointDirection()
+        {
+            float angle = RNG.NextSingle(0, 2 * MathF.PI);
+            return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
+        }
+
         private void onSmokeMoved(Vector2 position, double time)
         {
             if (!IsActive)
@@ -229,6 +220,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     {
                         Position = pointPos,
                         Time = time,
+                        Direction = nextPointDirection(),
                     });
 
                     pointPos += increment;
@@ -303,6 +295,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             public Vector2 Position;
             public double Time;
+            public Vector2 Direction;
 
             public struct UpperBoundComparer : IComparer<SmokePoint>
             {
@@ -339,9 +332,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             private IFrameBasedClock? clock;
 
-            private int rotationSeed;
-            private Random rotationRNG = new Random();
-
             protected SmokeDrawNode(ITexturedShaderDrawable source)
                 : base(source)
             {
@@ -362,8 +352,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 SmokeStartTime = Source.SmokeStartTime;
                 SmokeEndTime = Source.SmokeEndTime;
-
-                rotationSeed = Source.RotationSeed;
             }
 
             public sealed override void Draw(IRenderer renderer)
@@ -377,6 +365,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 Texture ??= renderer.WhitePixel;
 
                 var shader = GetAppropriateShader(renderer);
+
+                renderer.SetBlend(BlendingParameters.Additive);
+
                 shader.Bind();
                 Texture.Bind();
 
@@ -390,7 +381,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 ? ((SRGBColour)DrawColourInfo.Colour).Linear
                 : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
 
-            protected abstract Color4 ColorAtTime(double pointTime);
+            protected abstract Color4 PointColor(SmokePoint point);
+
+            protected abstract float PointScale(SmokePoint point);
+
+            protected abstract Vector2 PointDirection(SmokePoint point);
 
             protected virtual void UpdateDrawVariables(IRenderer renderer)
             {
@@ -399,7 +394,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 CurrentTime = clock.CurrentTime;
                 TextureRect = Texture.GetTextureRect();
-                rotationRNG = new Random(rotationSeed);
             }
 
             protected virtual void UpdateVertexBuffer()
@@ -408,24 +402,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     drawPointQuad(point);
             }
 
-            private Vector2 nextTextureDirection()
-            {
-                float angle = (float)rotationRNG.NextDouble() * 2 * MathF.PI;
-                return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
-            }
-
             private void drawPointQuad(SmokePoint point)
             {
                 Debug.Assert(QuadBatch != null);
 
-                var color = ColorAtTime(point.Time);
-                var dir = nextTextureDirection();
+                var color = PointColor(point);
+                float scale = PointScale(point);
+                var dir = PointDirection(point);
                 var ortho = dir.PerpendicularLeft;
 
-                var localTopLeft = point.Position + (Radius * (-ortho - dir)) - PositionOffset;
-                var localTopRight = point.Position + (Radius * (-ortho + dir)) - PositionOffset;
-                var localBotLeft = point.Position + (Radius * (ortho - dir)) - PositionOffset;
-                var localBotRight = point.Position + (Radius * (ortho + dir)) - PositionOffset;
+                var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
+                var localTopRight = point.Position + (Radius * scale * (-ortho + dir)) - PositionOffset;
+                var localBotLeft = point.Position + (Radius * scale * (ortho - dir)) - PositionOffset;
+                var localBotRight = point.Position + (Radius * scale * (ortho + dir)) - PositionOffset;
 
                 QuadBatch.Add(new TexturedVertex2D
                 {

From 8474335aeaf520b61a82b3800f473728e77b402d Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 22:08:45 -0700
Subject: [PATCH 411/709] Remove hacky LifetimeEnd workaround

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index b725cc028b..822dc113f1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -16,7 +16,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -265,10 +264,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             IsActive = false;
             SmokeEndTime = time;
             LifetimeEnd = time + LifetimeAfterSmokeEnd + 100;
-
-            // TODO: HYPER MEGA JANK WTF??
-            if (Parent is SkinnableDrawable)
-                Parent.LifetimeEnd = LifetimeEnd;
         }
 
         protected abstract override DrawNode CreateDrawNode();

From 3eb28881e4b0052894f9b60c0ebe649e02921118 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Sun, 18 Sep 2022 22:14:54 -0700
Subject: [PATCH 412/709] Temp default smoke scale/rotation anims

---
 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 0ba0143466..6eebd18305 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -58,15 +58,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 return color;
             }
 
-            protected override float PointScale(SmokePoint point)
-            {
-                throw new NotImplementedException();
-            }
+            protected override float PointScale(SmokePoint point) => 1f;
 
-            protected override Vector2 PointDirection(SmokePoint point)
-            {
-                throw new NotImplementedException();
-            }
+            protected override Vector2 PointDirection(SmokePoint point) => point.Direction;
         }
     }
 }

From 8204090e471f6784c9d1a520ac97b61e7391ff66 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 19 Sep 2022 00:07:22 -0700
Subject: [PATCH 413/709] Scale smoke radius based on texture width

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs | 5 +----
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs              | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 093d8f87eb..d8c3ff3521 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -65,7 +65,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         public LegacySmoke(ISkin skin)
         {
             this.skin = skin;
-            Radius = 3;
         }
 
         protected override void LoadComplete()
@@ -164,12 +163,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 fraction = 1 - MathF.Pow(1 - fraction, 5);
                 float angle = fraction * (finalAngle - initialAngle) + initialAngle;
 
-                return toVector2(angle);
+                return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
             }
 
             private float nextRotation() => max_rotation * ((float)rotationRNG.NextDouble() * 2 - 1);
-
-            private Vector2 toVector2(float angle) => new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 822dc113f1..bada67816b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -26,11 +26,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public IShader? TextureShader { get; private set; }
         public IShader? RoundedTextureShader { get; private set; }
 
-        private float radius = 1;
+        private float? radius;
 
         protected float Radius
         {
-            get => radius;
+            get => radius ?? Texture?.DisplayWidth * 0.165f ?? 3;
             set
             {
                 if (radius == value)

From 41e7d271d764bb9f0d5c77b7f192fa1592212f4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 21:51:54 +0900
Subject: [PATCH 414/709] Remove redundant string interpolation

---
 .../Visual/Gameplay/TestScenePlayerLocalScoreImport.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
index db9d2bfc1d..38a091dd85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLocalScoreImport.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Mod[] originalMods = { new OsuModDaycore { SpeedChange = { Value = 0.8 } } };
             Mod[] playerMods = null!;
 
-            AddStep($"Load player with mods", () => LoadPlayer(originalMods));
+            AddStep("load player with mods", () => LoadPlayer(originalMods));
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
 
             AddStep("get mods at start of gameplay", () => playerMods = Player.Score.ScoreInfo.Mods.ToArray());

From 0f7b38f4c3c463bc4f1a39f4577d6cccf30e835b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 16:02:57 +0900
Subject: [PATCH 415/709] Add new default skin "argon"

---
 .../Overlays/Settings/Sections/SkinSection.cs |   1 +
 .../Backgrounds/BackgroundScreenDefault.cs    |  16 +-
 osu.Game/Skinning/ArgonSkin.cs                | 198 ++++++++++++++++++
 .../Skinning/RulesetSkinProvidingContainer.cs |   1 +
 osu.Game/Skinning/SkinInfo.cs                 |   1 +
 osu.Game/Skinning/SkinManager.cs              |  31 +--
 osu.Game/Skinning/SkinnableSprite.cs          |   1 +
 osu.Game/Tests/Visual/SkinnableTestScene.cs   |   2 +-
 8 files changed, 234 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Skinning/ArgonSkin.cs

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 8d491a980a..f602b73065 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -104,6 +104,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // In the future we should change this to properly handle ChangeSet events.
             dropdownItems.Clear();
 
+            dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.ARGON_SKIN).ToLive(realm));
             dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.TRIANGLES_SKIN).ToLive(realm));
             dropdownItems.Add(sender.Single(s => s.ID == SkinInfo.CLASSIC_SKIN).ToLive(realm));
 
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index dbc4e2b2e1..f8546d6ed0 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -129,11 +129,19 @@ namespace osu.Game.Screens.Backgrounds
                     }
 
                     case BackgroundSource.Skin:
-                        // default skins should use the default background rotation, which won't be the case if a SkinBackground is created for them.
-                        if (skin.Value is TrianglesSkin || skin.Value is DefaultLegacySkin)
-                            break;
+                        switch (skin.Value)
+                        {
+                            case TrianglesSkin:
+                            case ArgonSkin:
+                            case DefaultLegacySkin:
+                                // default skins should use the default background rotation, which won't be the case if a SkinBackground is created for them.
+                                break;
+
+                            default:
+                                newBackground = new SkinBackground(skin.Value, getBackgroundTextureName());
+                                break;
+                        }
 
-                        newBackground = new SkinBackground(skin.Value, getBackgroundTextureName());
                         break;
                 }
             }
diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
new file mode 100644
index 0000000000..2c17b28b01
--- /dev/null
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -0,0 +1,198 @@
+// 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.
+
+#nullable disable
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Extensions;
+using osu.Game.IO;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning
+{
+    public class ArgonSkin : Skin
+    {
+        public static SkinInfo CreateInfo() => new SkinInfo
+        {
+            ID = osu.Game.Skinning.SkinInfo.ARGON_SKIN,
+            Name = "osu! \"argon\" (2022)",
+            Creator = "team osu!",
+            Protected = true,
+            InstantiationInfo = typeof(ArgonSkin).GetInvariantInstantiationInfo()
+        };
+
+        private readonly IStorageResourceProvider resources;
+
+        public ArgonSkin(IStorageResourceProvider resources)
+            : this(CreateInfo(), resources)
+        {
+        }
+
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
+        public ArgonSkin(SkinInfo skin, IStorageResourceProvider resources)
+            : base(skin, resources)
+        {
+            this.resources = resources;
+        }
+
+        public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);
+
+        public override ISample GetSample(ISampleInfo sampleInfo)
+        {
+            foreach (string lookup in sampleInfo.LookupNames)
+            {
+                var sample = Samples?.Get(lookup) ?? resources.AudioManager?.Samples.Get(lookup);
+                if (sample != null)
+                    return sample;
+            }
+
+            return null;
+        }
+
+        public override Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            if (base.GetDrawableComponent(component) is Drawable c)
+                return c;
+
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.SongSelect:
+                            var songSelectComponents = new SkinnableTargetComponentsContainer(_ =>
+                            {
+                                // do stuff when we need to.
+                            });
+
+                            return songSelectComponents;
+
+                        case SkinnableTarget.MainHUDComponents:
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
+                            {
+                                var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
+                                var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
+                                var ppCounter = container.OfType<PerformancePointsCounter>().FirstOrDefault();
+
+                                if (score != null)
+                                {
+                                    score.Anchor = Anchor.TopCentre;
+                                    score.Origin = Anchor.TopCentre;
+
+                                    // elements default to beneath the health bar
+                                    const float vertical_offset = 30;
+
+                                    const float horizontal_padding = 20;
+
+                                    score.Position = new Vector2(0, vertical_offset);
+
+                                    if (ppCounter != null)
+                                    {
+                                        ppCounter.Y = score.Position.Y + ppCounter.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).Y - 4;
+                                        ppCounter.Origin = Anchor.TopCentre;
+                                        ppCounter.Anchor = Anchor.TopCentre;
+                                    }
+
+                                    if (accuracy != null)
+                                    {
+                                        accuracy.Position = new Vector2(-accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 - horizontal_padding, vertical_offset + 5);
+                                        accuracy.Origin = Anchor.TopRight;
+                                        accuracy.Anchor = Anchor.TopCentre;
+
+                                        if (combo != null)
+                                        {
+                                            combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
+                                            combo.Anchor = Anchor.TopCentre;
+                                        }
+                                    }
+
+                                    var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+
+                                    if (hitError != null)
+                                    {
+                                        hitError.Anchor = Anchor.CentreLeft;
+                                        hitError.Origin = Anchor.CentreLeft;
+                                    }
+
+                                    var hitError2 = container.OfType<HitErrorMeter>().LastOrDefault();
+
+                                    if (hitError2 != null)
+                                    {
+                                        hitError2.Anchor = Anchor.CentreRight;
+                                        hitError2.Scale = new Vector2(-1, 1);
+                                        // origin flipped to match scale above.
+                                        hitError2.Origin = Anchor.CentreLeft;
+                                    }
+                                }
+                            })
+                            {
+                                Children = new Drawable[]
+                                {
+                                    new DefaultComboCounter(),
+                                    new DefaultScoreCounter(),
+                                    new DefaultAccuracyCounter(),
+                                    new DefaultHealthDisplay(),
+                                    new DefaultSongProgress(),
+                                    new BarHitErrorMeter(),
+                                    new BarHitErrorMeter(),
+                                    new PerformancePointsCounter()
+                                }
+                            };
+
+                            return skinnableTargetWrapper;
+                    }
+
+                    return null;
+            }
+
+            switch (component.LookupName)
+            {
+                // Temporary until default skin has a valid hit lighting.
+                case @"lighting":
+                    return Drawable.Empty();
+            }
+
+            if (GetTexture(component.LookupName) is Texture t)
+                return new Sprite { Texture = t };
+
+            return null;
+        }
+
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            // todo: this code is pulled from LegacySkin and should not exist.
+            // will likely change based on how databased storage of skin configuration goes.
+            switch (lookup)
+            {
+                case GlobalSkinColours global:
+                    switch (global)
+                    {
+                        case GlobalSkinColours.ComboColours:
+                            return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(Configuration.ComboColours));
+                    }
+
+                    break;
+
+                case SkinComboColourLookup comboColour:
+                    return SkinUtils.As<TValue>(new Bindable<Color4>(getComboColour(Configuration, comboColour.ColourIndex)));
+            }
+
+            return null;
+        }
+
+        private static Color4 getComboColour(IHasComboColours source, int colourIndex)
+            => source.ComboColours[colourIndex % source.ComboColours.Count];
+    }
+}
diff --git a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
index 4c35681f66..6ad5d64e4b 100644
--- a/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/RulesetSkinProvidingContainer.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Skinning
                 }
             }
 
+            // TODO: check
             int lastDefaultSkinIndex = sources.IndexOf(sources.OfType<TrianglesSkin>().LastOrDefault());
 
             // Ruleset resources should be given the ability to override game-wide defaults
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 34728245c8..08d8a81d4c 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Skinning
     public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasGuidPrimaryKey, ISoftDelete, IHasNamedFiles
     {
         internal static readonly Guid TRIANGLES_SKIN = new Guid("2991CFD8-2140-469A-BCB9-2EC23FBCE4AD");
+        internal static readonly Guid ARGON_SKIN = new Guid("CFFA69DE-B3E3-4DEE-8563-3C4F425C05D0");
         internal static readonly Guid CLASSIC_SKIN = new Guid("81F02CD3-EEC6-4865-AC23-FAE26A386187");
         internal static readonly Guid RANDOM_SKIN = new Guid("D39DFEFB-477C-4372-B1EA-2BCEA5FB8908");
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index a9a01dfebf..059767d8f8 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -49,10 +49,7 @@ namespace osu.Game.Skinning
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>();
 
-        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(TrianglesSkin.CreateInfo().ToLiveUnmanaged())
-        {
-            Default = TrianglesSkin.CreateInfo().ToLiveUnmanaged()
-        };
+        public readonly Bindable<Live<SkinInfo>> CurrentSkinInfo = new Bindable<Live<SkinInfo>>(ArgonSkin.CreateInfo().ToLiveUnmanaged());
 
         private readonly SkinImporter skinImporter;
 
@@ -61,7 +58,12 @@ namespace osu.Game.Skinning
         /// <summary>
         /// The default "triangles" skin.
         /// </summary>
-        public Skin DefaultSkinTriangles { get; }
+        private Skin argonSkin { get; }
+
+        /// <summary>
+        /// The default skin (old).
+        /// </summary>
+        private Skin trianglesSkin { get; }
 
         /// <summary>
         /// The default "classic" skin.
@@ -86,7 +88,8 @@ namespace osu.Game.Skinning
             var defaultSkins = new[]
             {
                 DefaultClassicSkin = new DefaultLegacySkin(this),
-                DefaultSkinTriangles = new TrianglesSkin(this),
+                trianglesSkin = new TrianglesSkin(this),
+                argonSkin = new ArgonSkin(this),
             };
 
             // Ensure the default entries are present.
@@ -104,7 +107,7 @@ namespace osu.Game.Skinning
                 CurrentSkin.Value = skin.NewValue.PerformRead(GetSkin);
             };
 
-            CurrentSkin.Value = DefaultSkinTriangles;
+            CurrentSkin.Value = argonSkin;
             CurrentSkin.ValueChanged += skin =>
             {
                 if (!skin.NewValue.SkinInfo.Equals(CurrentSkinInfo.Value))
@@ -125,7 +128,7 @@ namespace osu.Game.Skinning
 
                 if (randomChoices.Length == 0)
                 {
-                    CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged();
+                    CurrentSkinInfo.Value = ArgonSkin.CreateInfo().ToLiveUnmanaged();
                     return;
                 }
 
@@ -229,11 +232,15 @@ namespace osu.Game.Skinning
             {
                 yield return CurrentSkin.Value;
 
+                // Skin manager provides default fallbacks.
+                // This handles cases where a user skin doesn't have the required resources for complete display of
+                // certain elements.
+
                 if (CurrentSkin.Value is LegacySkin && CurrentSkin.Value != DefaultClassicSkin)
                     yield return DefaultClassicSkin;
 
-                if (CurrentSkin.Value != DefaultSkinTriangles)
-                    yield return DefaultSkinTriangles;
+                if (CurrentSkin.Value != trianglesSkin)
+                    yield return trianglesSkin;
             }
         }
 
@@ -294,7 +301,7 @@ namespace osu.Game.Skinning
                 Guid currentUserSkin = CurrentSkinInfo.Value.ID;
 
                 if (items.Any(s => s.ID == currentUserSkin))
-                    scheduler.Add(() => CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged());
+                    scheduler.Add(() => CurrentSkinInfo.Value = ArgonSkin.CreateInfo().ToLiveUnmanaged());
 
                 Delete(items.ToList(), silent);
             });
@@ -313,7 +320,7 @@ namespace osu.Game.Skinning
                     skinInfo = DefaultClassicSkin.SkinInfo;
             }
 
-            CurrentSkinInfo.Value = skinInfo ?? DefaultSkinTriangles.SkinInfo;
+            CurrentSkinInfo.Value = skinInfo ?? trianglesSkin.SkinInfo;
         }
     }
 }
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index 69454de979..f8a9aaa6fb 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -113,6 +113,7 @@ namespace osu.Game.Skinning
                 // Temporarily used to exclude undesirable ISkin implementations
                 static bool isUserSkin(ISkin skin)
                     => skin.GetType() == typeof(TrianglesSkin)
+                       || skin.GetType() == typeof(ArgonSkin)
                        || skin.GetType() == typeof(DefaultLegacySkin)
                        || skin.GetType() == typeof(LegacySkin);
             }
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 4ef9a733c4..a8193701ef 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual
                     },
                     new OsuSpriteText
                     {
-                        Text = skin?.SkinInfo.Value.Name ?? "none",
+                        Text = skin.SkinInfo.Value.Name,
                         Scale = new Vector2(1.5f),
                         Padding = new MarginPadding(5),
                     },

From b766493776071d9ecc6660fb8df200f1066abcad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Sep 2022 17:51:10 +0900
Subject: [PATCH 416/709] Add basic argon skin transformer for osu! ruleset

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |   4 +
 .../Skinning/Argon/ArgonMainCirclePiece.cs    | 157 ++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  49 ++++++
 .../Skinning/Default/RingPiece.cs             |   4 +-
 4 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 0a5b3139fc..3f5e728651 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Osu.Skinning.Argon;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Rulesets.Osu.UI;
@@ -237,6 +238,9 @@ namespace osu.Game.Rulesets.Osu
             {
                 case LegacySkin:
                     return new OsuLegacySkinTransformer(skin);
+
+                case ArgonSkin:
+                    return new OsuArgonSkinTransformer(skin);
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
new file mode 100644
index 0000000000..7f645f1452
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -0,0 +1,157 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonMainCirclePiece : CompositeDrawable
+    {
+        private readonly Circle outerFill;
+        private readonly Circle outerGradient;
+        private readonly Circle innerGradient;
+        private readonly Circle innerFill;
+
+        private readonly RingPiece ring;
+        private readonly OsuSpriteText number;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+        private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
+
+        [Resolved]
+        private DrawableHitObject drawableObject { get; set; } = null!;
+
+        public ArgonMainCirclePiece()
+        {
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            const float border_thickness = 7;
+            const float fill_thickness = 24;
+
+            InternalChildren = new Drawable[]
+            {
+                outerFill = new Circle // renders white outer border and dark fill
+                {
+                    Size = Size,
+                    Alpha = 1,
+                },
+                outerGradient = new Circle // renders the outer bright gradient
+                {
+                    Size = outerFill.Size - new Vector2(border_thickness * 3),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                innerGradient = new Circle // renders the inner bright gradient
+                {
+                    Size = outerGradient.Size - new Vector2(fill_thickness),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                innerFill = new Circle // renders the inner dark fill
+                {
+                    Size = innerGradient.Size - new Vector2(fill_thickness),
+                    Alpha = 1,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                number = new OsuSpriteText
+                {
+                    Font = OsuFont.Default.With(size: 52, weight: FontWeight.Bold),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = -2,
+                    Text = @"1",
+                },
+                ring = new RingPiece(border_thickness),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var drawableOsuObject = (DrawableOsuHitObject)drawableObject;
+
+            accentColour.BindTo(drawableObject.AccentColour);
+            indexInCurrentCombo.BindTo(drawableOsuObject.IndexInCurrentComboBindable);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            accentColour.BindValueChanged(colour =>
+            {
+                outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
+                outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
+                innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
+            }, true);
+
+            indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
+
+            drawableObject.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableObject, drawableObject.State.Value);
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
+                switch (state)
+                {
+                    case ArmedState.Hit:
+                        const double fade_out_time = 600;
+                        const double flash_in = 200;
+
+                        number.FadeOut(flash_in / 4);
+
+                        outerGradient.ResizeTo(Size, fade_out_time / 2, Easing.OutQuint);
+                        outerGradient.FadeOut(flash_in);
+
+                        innerGradient.ResizeTo(Size, fade_out_time * 2, Easing.OutQuint);
+                        innerGradient.FadeOut(flash_in);
+
+                        innerFill.ResizeTo(Size, fade_out_time * 1.5, Easing.OutQuint);
+                        innerFill.FadeOut(flash_in);
+
+                        outerFill.FadeOut(flash_in);
+
+                        ring.ResizeTo(Size + new Vector2(ring.BorderThickness * 1.5f), fade_out_time / 1.5f, Easing.OutQuint);
+                        ring.FadeOut(fade_out_time);
+
+                        using (BeginDelayedSequence(flash_in))
+                            this.FadeOut(fade_out_time, Easing.OutQuint);
+
+                        break;
+                }
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableObject.IsNotNull())
+                drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
new file mode 100644
index 0000000000..6aced740bc
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -0,0 +1,49 @@
+// 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;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class OsuArgonSkinTransformer : ISkin
+    {
+        public OsuArgonSkinTransformer(ISkin skin)
+        {
+        }
+
+        public Drawable? GetDrawableComponent(ISkinComponent component)
+        {
+            if (component is OsuSkinComponent osuComponent)
+            {
+                switch (osuComponent.Component)
+                {
+                    case OsuSkinComponents.HitCircle:
+                    case OsuSkinComponents.SliderHeadHitCircle:
+                        return new ArgonMainCirclePiece();
+                }
+            }
+
+            return null;
+        }
+
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
+        {
+            return null;
+        }
+
+        public ISample? GetSample(ISampleInfo sampleInfo)
+        {
+            return null;
+        }
+
+        public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
+        {
+            return null;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
index b941a86171..c14246e90e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class RingPiece : CircularContainer
     {
-        public RingPiece()
+        public RingPiece(float thickness = 9)
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             Origin = Anchor.Centre;
 
             Masking = true;
-            BorderThickness = 9; // roughly matches slider borders and makes stacked circles distinctly visible from each other.
+            BorderThickness = thickness;
             BorderColour = Color4.White;
 
             Child = new Box

From 4a86fe1ca90d79fc46db9fa8a23bd77f55ccfb34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 19:25:12 +0900
Subject: [PATCH 417/709] Tweak main circle animations

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs    | 74 +++++++++++++++----
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 7f645f1452..02271b6a7a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -8,6 +8,7 @@ using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -32,6 +33,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
+        private readonly FlashPiece flash;
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; } = null!;
@@ -82,6 +84,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Y = -2,
                     Text = @"1",
                 },
+                flash = new FlashPiece(),
                 ring = new RingPiece(border_thickness),
             };
         }
@@ -104,6 +107,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
                 outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
                 innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
+                flash.Colour = colour.NewValue.Multiply(1f);
             }, true);
 
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
@@ -119,27 +123,37 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 switch (state)
                 {
                     case ArmedState.Hit:
-                        const double fade_out_time = 600;
-                        const double flash_in = 200;
+                        const double fade_out_time = 800;
+                        const double flash_in = 150;
 
-                        number.FadeOut(flash_in / 4);
-
-                        outerGradient.ResizeTo(Size, fade_out_time / 2, Easing.OutQuint);
-                        outerGradient.FadeOut(flash_in);
-
-                        innerGradient.ResizeTo(Size, fade_out_time * 2, Easing.OutQuint);
-                        innerGradient.FadeOut(flash_in);
-
-                        innerFill.ResizeTo(Size, fade_out_time * 1.5, Easing.OutQuint);
-                        innerFill.FadeOut(flash_in);
+                        number.FadeOut(flash_in / 2);
 
                         outerFill.FadeOut(flash_in);
 
-                        ring.ResizeTo(Size + new Vector2(ring.BorderThickness * 1.5f), fade_out_time / 1.5f, Easing.OutQuint);
-                        ring.FadeOut(fade_out_time);
+                        ring.ResizeTo(Size - new Vector2(ring.BorderThickness * 1.5f), flash_in, Easing.OutQuint);
 
-                        using (BeginDelayedSequence(flash_in))
-                            this.FadeOut(fade_out_time, Easing.OutQuint);
+                        ring.TransformTo(nameof
+                            (BorderColour), ColourInfo.GradientVertical(
+                            accentColour.Value.Opacity(0.5f),
+                            accentColour.Value.Opacity(0)), fade_out_time);
+
+                        flash.FadeTo(1, flash_in * 2, Easing.OutQuint);
+
+                        using (BeginDelayedSequence(flash_in / 8))
+                        {
+                            outerGradient.ResizeTo(outerGradient.Size * 0.8f, flash_in, Easing.OutQuint);
+
+                            using (BeginDelayedSequence(flash_in / 8))
+                            {
+                                innerGradient.ResizeTo(innerGradient.Size * 0.8f, flash_in, Easing.OutQuint);
+                                innerFill.ResizeTo(innerFill.Size * 0.8f, flash_in, Easing.OutQuint);
+                            }
+                        }
+
+                        innerFill.FadeOut(flash_in, Easing.OutQuint);
+                        innerGradient.FadeOut(flash_in, Easing.OutQuint);
+
+                        this.FadeOut(fade_out_time, Easing.OutQuad);
 
                         break;
                 }
@@ -153,5 +167,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             if (drawableObject.IsNotNull())
                 drawableObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
+
+        private class FlashPiece : Circle
+        {
+            public FlashPiece()
+            {
+                Size = new Vector2(OsuHitObject.OBJECT_RADIUS);
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Alpha = 0;
+                Blending = BlendingParameters.Additive;
+
+                Child.Alpha = 0;
+                Child.AlwaysPresent = true;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Colour,
+                    Radius = OsuHitObject.OBJECT_RADIUS * 1.4f,
+                };
+            }
+        }
     }
 }

From 02fbb04ba86c8af0ad251f3a1eeb1d146ebfdc4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Sep 2022 19:25:04 +0900
Subject: [PATCH 418/709] Add basic argon judgement

---
 .../Skinning/Argon/ArgonJudgementPiece.cs     | 85 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs | 21 +++--
 2 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
new file mode 100644
index 0000000000..315b9ec65e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -0,0 +1,85 @@
+// 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.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        protected readonly HitResult Result;
+
+        protected SpriteText JudgementText { get; private set; } = null!;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        public ArgonJudgementPiece(HitResult result)
+        {
+            Result = result;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                JudgementText = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Text = Result.GetDescription().ToUpperInvariant(),
+                    Colour = colours.ForHitResult(Result),
+                    Spacing = new Vector2(5, 0),
+                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold),
+                }
+            };
+        }
+
+        /// <summary>
+        /// Plays the default animation for this judgement piece.
+        /// </summary>
+        /// <remarks>
+        /// The base implementation only handles fade (for all result types) and misses.
+        /// Individual rulesets are recommended to implement their appropriate hit animations.
+        /// </remarks>
+        public virtual void PlayAnimation()
+        {
+            switch (Result)
+            {
+                default:
+                    JudgementText
+                        .ScaleTo(Vector2.One)
+                        .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
+                    break;
+
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveTo(Vector2.Zero);
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(0);
+                    this.RotateTo(40, 800, Easing.InQuint);
+                    break;
+            }
+
+            this.FadeOutFromOne(800);
+        }
+
+        public Drawable? GetAboveHitObjectsProxiedContent() => null;
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 6aced740bc..6523a5cb88 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
@@ -18,14 +19,20 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         public Drawable? GetDrawableComponent(ISkinComponent component)
         {
-            if (component is OsuSkinComponent osuComponent)
+            switch (component)
             {
-                switch (osuComponent.Component)
-                {
-                    case OsuSkinComponents.HitCircle:
-                    case OsuSkinComponents.SliderHeadHitCircle:
-                        return new ArgonMainCirclePiece();
-                }
+                case GameplaySkinComponent<HitResult> resultComponent:
+                    return new ArgonJudgementPiece(resultComponent.Component);
+
+                case OsuSkinComponent osuComponent:
+                    switch (osuComponent.Component)
+                    {
+                        case OsuSkinComponents.HitCircle:
+                        case OsuSkinComponents.SliderHeadHitCircle:
+                            return new ArgonMainCirclePiece();
+                    }
+
+                    break;
             }
 
             return null;

From 403cc592088744ebd65ea222b2b3d1700b32243e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 13:19:56 +0900
Subject: [PATCH 419/709] Further animation tweaks and better documentation

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs    | 61 ++++++++++++-------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 02271b6a7a..1271bd8d61 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private readonly Circle innerGradient;
         private readonly Circle innerFill;
 
-        private readonly RingPiece ring;
+        private readonly RingPiece border;
         private readonly OsuSpriteText number;
 
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Text = @"1",
                 },
                 flash = new FlashPiece(),
-                ring = new RingPiece(border_thickness),
+                border = new RingPiece(border_thickness),
             };
         }
 
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
                 outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
                 innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
-                flash.Colour = colour.NewValue.Multiply(1f);
+                flash.Colour = colour.NewValue;
             }, true);
 
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
@@ -123,38 +123,51 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 switch (state)
                 {
                     case ArmedState.Hit:
+                        // Fade out time is at a maximum of 800. Must match `DrawableHitCircle`'s arbitrary lifetime spec.
                         const double fade_out_time = 800;
-                        const double flash_in = 150;
 
-                        number.FadeOut(flash_in / 2);
+                        const double flash_in_duration = 150;
+                        const double resize_duration = 300;
 
-                        outerFill.FadeOut(flash_in);
+                        const float shrink_size = 0.8f;
 
-                        ring.ResizeTo(Size - new Vector2(ring.BorderThickness * 1.5f), flash_in, Easing.OutQuint);
+                        // Animating with the number present is distracting.
+                        // The number disappearing is hidden by the bright flash.
+                        number.FadeOut(flash_in_duration / 2);
 
-                        ring.TransformTo(nameof
+                        // The fill layers add too much noise during the explosion animation.
+                        // They will be hidden by the additive effects anyway.
+                        outerFill.FadeOut(flash_in_duration, Easing.OutQuint);
+                        innerFill.FadeOut(flash_in_duration, Easing.OutQuint);
+
+                        // The inner-most gradient should actually be resizing, but is only visible for
+                        // a few milliseconds before it's hidden by the flash, so it's pointless overhead to bother with it.
+                        innerGradient.FadeOut(flash_in_duration, Easing.OutQuint);
+
+                        // The border is always white, but after hit it gets coloured by the skin/beatmap's colouring.
+                        // A gradient is applied to make the border less prominent over the course of the animation.
+                        // Without this, the border dominates the visual presence of the explosion animation in a bad way.
+                        border.TransformTo(nameof
                             (BorderColour), ColourInfo.GradientVertical(
                             accentColour.Value.Opacity(0.5f),
                             accentColour.Value.Opacity(0)), fade_out_time);
 
-                        flash.FadeTo(1, flash_in * 2, Easing.OutQuint);
+                        // The outer ring shrinks immediately, but accounts for its thickness so it doesn't overlap the inner
+                        // gradient layers.
+                        border.ResizeTo(Size * shrink_size + new Vector2(border.BorderThickness), resize_duration, Easing.OutElasticHalf);
 
-                        using (BeginDelayedSequence(flash_in / 8))
-                        {
-                            outerGradient.ResizeTo(outerGradient.Size * 0.8f, flash_in, Easing.OutQuint);
+                        // The outer gradient is resize with a slight delay from the border.
+                        // This is to give it a bomb-like effect, with the border "triggering" its animation when getting close.
+                        using (BeginDelayedSequence(flash_in_duration / 12))
+                            outerGradient.ResizeTo(outerGradient.Size * shrink_size, resize_duration, Easing.OutElasticHalf);
 
-                            using (BeginDelayedSequence(flash_in / 8))
-                            {
-                                innerGradient.ResizeTo(innerGradient.Size * 0.8f, flash_in, Easing.OutQuint);
-                                innerFill.ResizeTo(innerFill.Size * 0.8f, flash_in, Easing.OutQuint);
-                            }
-                        }
-
-                        innerFill.FadeOut(flash_in, Easing.OutQuint);
-                        innerGradient.FadeOut(flash_in, Easing.OutQuint);
+                        // The flash layer starts white to give the wanted brightness, but is almost immediately
+                        // recoloured to the accent colour. This would more correctly be done with two layers (one for the initial flash)
+                        // but works well enough with the colour fade.
+                        flash.FadeTo(1, flash_in_duration, Easing.OutQuint);
+                        flash.FlashColour(Color4.White, flash_in_duration, Easing.OutQuint);
 
                         this.FadeOut(fade_out_time, Easing.OutQuad);
-
                         break;
                 }
             }
@@ -180,6 +193,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 Alpha = 0;
                 Blending = BlendingParameters.Additive;
 
+                // The edge effect provides the fill due to not being rendered hollow.
                 Child.Alpha = 0;
                 Child.AlwaysPresent = true;
             }
@@ -187,11 +201,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             protected override void Update()
             {
                 base.Update();
+
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Colour = Colour,
-                    Radius = OsuHitObject.OBJECT_RADIUS * 1.4f,
+                    Radius = OsuHitObject.OBJECT_RADIUS * 1.2f,
                 };
             }
         }

From cd84503e62a7fbd6f9603771225b246b1bddd04b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 14:38:21 +0900
Subject: [PATCH 420/709] Add slider body

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs    | 22 +++++------
 .../Skinning/Argon/ArgonSliderBody.cs         | 38 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  3 ++
 .../Skinning/Default/PlaySliderBody.cs        | 14 ++++---
 4 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 1271bd8d61..e4ed3d8fe8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -23,7 +23,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public class ArgonMainCirclePiece : CompositeDrawable
     {
-        private readonly Circle outerFill;
+        public const float BORDER_THICKNESS = 7;
+
+        public const float OUTER_GRADIENT_SIZE = OsuHitObject.OBJECT_RADIUS * 2 - BORDER_THICKNESS * 3;
+
         private readonly Circle outerGradient;
         private readonly Circle innerGradient;
         private readonly Circle innerFill;
@@ -45,33 +48,27 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            const float border_thickness = 7;
             const float fill_thickness = 24;
 
             InternalChildren = new Drawable[]
             {
-                outerFill = new Circle // renders white outer border and dark fill
-                {
-                    Size = Size,
-                    Alpha = 1,
-                },
                 outerGradient = new Circle // renders the outer bright gradient
                 {
-                    Size = outerFill.Size - new Vector2(border_thickness * 3),
+                    Size = new Vector2(OUTER_GRADIENT_SIZE),
                     Alpha = 1,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
                 innerGradient = new Circle // renders the inner bright gradient
                 {
-                    Size = outerGradient.Size - new Vector2(fill_thickness),
+                    Size = new Vector2(OUTER_GRADIENT_SIZE - fill_thickness),
                     Alpha = 1,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
                 innerFill = new Circle // renders the inner dark fill
                 {
-                    Size = innerGradient.Size - new Vector2(fill_thickness),
+                    Size = new Vector2(OUTER_GRADIENT_SIZE - 2 * fill_thickness),
                     Alpha = 1,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -85,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Text = @"1",
                 },
                 flash = new FlashPiece(),
-                border = new RingPiece(border_thickness),
+                border = new RingPiece(BORDER_THICKNESS),
             };
         }
 
@@ -104,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             accentColour.BindValueChanged(colour =>
             {
-                outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
+                innerFill.Colour = colour.NewValue.Darken(4);
                 outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
                 innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
                 flash.Colour = colour.NewValue;
@@ -137,7 +134,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         // The fill layers add too much noise during the explosion animation.
                         // They will be hidden by the additive effects anyway.
-                        outerFill.FadeOut(flash_in_duration, Easing.OutQuint);
                         innerFill.FadeOut(flash_in_duration, Easing.OutQuint);
 
                         // The inner-most gradient should actually be resizing, but is only visible for
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs
new file mode 100644
index 0000000000..115e153f34
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs
@@ -0,0 +1,38 @@
+// 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.Extensions.Color4Extensions;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderBody : PlaySliderBody
+    {
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AccentColourBindable.BindValueChanged(accent =>
+            {
+                BorderColour = accent.NewValue;
+            }, true);
+            ScaleBindable.BindValueChanged(scale => PathRadius = ArgonMainCirclePiece.OUTER_GRADIENT_SIZE / 2 * scale.NewValue, true);
+
+            BorderSize = ArgonMainCirclePiece.BORDER_THICKNESS / 4;
+        }
+
+        protected override Default.DrawableSliderPath CreateSliderPath() => new DrawableSliderPath();
+
+        private class DrawableSliderPath : Default.DrawableSliderPath
+        {
+            protected override Color4 ColourAt(float position)
+            {
+                if (CalculatedBorderPortion != 0f && position <= CalculatedBorderPortion)
+                    return BorderColour;
+
+                return AccentColour.Darken(4);
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 6523a5cb88..d257271455 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         case OsuSkinComponents.HitCircle:
                         case OsuSkinComponents.SliderHeadHitCircle:
                             return new ArgonMainCirclePiece();
+
+                        case OsuSkinComponents.SliderBody:
+                            return new ArgonSliderBody();
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 83f7bb8904..6c422cf127 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -16,9 +16,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class PlaySliderBody : SnakingSliderBody
     {
-        private IBindable<float> scaleBindable;
+        protected IBindable<float> ScaleBindable { get; private set; } = null!;
+
+        protected IBindable<Color4> AccentColourBindable { get; private set; } = null!;
+
         private IBindable<int> pathVersion;
-        private IBindable<Color4> accentColour;
 
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
@@ -30,14 +32,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         {
             var drawableSlider = (DrawableSlider)drawableObject;
 
-            scaleBindable = drawableSlider.ScaleBindable.GetBoundCopy();
-            scaleBindable.BindValueChanged(scale => PathRadius = OsuHitObject.OBJECT_RADIUS * scale.NewValue, true);
+            ScaleBindable = drawableSlider.ScaleBindable.GetBoundCopy();
+            ScaleBindable.BindValueChanged(scale => PathRadius = OsuHitObject.OBJECT_RADIUS * scale.NewValue, true);
 
             pathVersion = drawableSlider.PathVersion.GetBoundCopy();
             pathVersion.BindValueChanged(_ => Refresh());
 
-            accentColour = drawableObject.AccentColour.GetBoundCopy();
-            accentColour.BindValueChanged(accent => AccentColour = GetBodyAccentColour(skin, accent.NewValue), true);
+            AccentColourBindable = drawableObject.AccentColour.GetBoundCopy();
+            AccentColourBindable.BindValueChanged(accent => AccentColour = GetBodyAccentColour(skin, accent.NewValue), true);
 
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
             config?.BindWith(OsuRulesetSetting.SnakingOutSliders, configSnakingOut);

From ef6ea49b188b42aeb1771054356ed5bbbc9f4671 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 14:58:27 +0900
Subject: [PATCH 421/709] Add slider ball

---
 .../Skinning/Argon/ArgonSliderBall.cs         | 55 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  6 ++
 2 files changed, 61 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
new file mode 100644
index 0000000000..5c31f079d4
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -0,0 +1,55 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderBall : CircularContainer
+    {
+        private readonly Box fill;
+        private readonly SpriteIcon icon;
+
+        public ArgonSliderBall()
+        {
+            Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE);
+
+            Masking = true;
+
+            BorderThickness = ArgonMainCirclePiece.BORDER_THICKNESS * 2;
+            BorderColour = Color4.White;
+
+            InternalChildren = new Drawable[]
+            {
+                fill = new Box
+                {
+                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                icon = new SpriteIcon
+                {
+                    Size = new Vector2(48),
+                    Scale = new Vector2(0.6f, 0.8f),
+                    Icon = FontAwesome.Solid.AngleRight,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            fill.Rotation = -Rotation;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index d257271455..de55fd5743 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -33,6 +33,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.SliderBody:
                             return new ArgonSliderBody();
+
+                        case OsuSkinComponents.SliderBall:
+                            return new ArgonSliderBall();
+
+                        case OsuSkinComponents.SliderScorePoint:
+                            return new ArgonSliderScorePoint();
                     }
 
                     break;

From d4e2f70f877910d48e69349d2f2e7686cd57384b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 14:59:03 +0900
Subject: [PATCH 422/709] Add slider score point

---
 .../Skinning/Argon/ArgonSliderScorePoint.cs   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs
new file mode 100644
index 0000000000..1ab546b613
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs
@@ -0,0 +1,40 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSliderScorePoint : CircularContainer
+    {
+        private Bindable<Color4> accentColour = null!;
+
+        private const float size = 12;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject hitObject)
+        {
+            Masking = true;
+            Origin = Anchor.Centre;
+            Size = new Vector2(size);
+            BorderThickness = 3;
+            BorderColour = Color4.White;
+            Child = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                AlwaysPresent = true,
+                Alpha = 0,
+            };
+
+            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(accent => BorderColour = accent.NewValue);
+        }
+    }
+}

From 3c0983b0dbc95ebcc4ea8d7717793cf50a78cbad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 15:39:08 +0900
Subject: [PATCH 423/709] Add slider reverse arrow

---
 .../Skinning/Argon/ArgonReverseArrow.cs       | 54 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  3 ++
 2 files changed, 57 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
new file mode 100644
index 0000000000..3f13fe135e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -0,0 +1,54 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonReverseArrow : CompositeDrawable
+    {
+        private Bindable<Color4> accentColour = null!;
+
+        private SpriteIcon icon = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject hitObject)
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
+            InternalChildren = new Drawable[]
+            {
+                new Circle
+                {
+                    Size = new Vector2(40, 20),
+                    Colour = Color4.White,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                icon = new SpriteIcon
+                {
+                    Icon = FontAwesome.Solid.AngleDoubleRight,
+                    Size = new Vector2(16),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+
+            accentColour = hitObject.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index de55fd5743..dcd198c700 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.SliderScorePoint:
                             return new ArgonSliderScorePoint();
+
+                        case OsuSkinComponents.ReverseArrow:
+                            return new ArgonReverseArrow();
                     }
 
                     break;

From 4f1530c2dbc8abbde9a3ab1813085b69c7aca996 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 16:07:13 +0900
Subject: [PATCH 424/709] Add slider follow circle

---
 .../Skinning/Argon/ArgonFollowCircle.cs       | 71 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  3 +
 2 files changed, 74 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
new file mode 100644
index 0000000000..83c5f6295a
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowCircle.cs
@@ -0,0 +1,71 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonFollowCircle : FollowCircle
+    {
+        public ArgonFollowCircle()
+        {
+            InternalChild = new CircularContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                BorderThickness = 4,
+                BorderColour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                Blending = BlendingParameters.Additive,
+                Child = new Box
+                {
+                    Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.3f,
+                }
+            };
+        }
+
+        protected override void OnSliderPress()
+        {
+            const float duration = 300f;
+
+            if (Precision.AlmostEquals(0, Alpha))
+                this.ScaleTo(1);
+
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA, duration, Easing.OutQuint)
+                .FadeIn(duration, Easing.OutQuint);
+        }
+
+        protected override void OnSliderRelease()
+        {
+            const float duration = 150;
+
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.2f, duration, Easing.OutQuint)
+                .FadeTo(0, duration, Easing.OutQuint);
+        }
+
+        protected override void OnSliderEnd()
+        {
+            const float duration = 300;
+
+            this.ScaleTo(1, duration, Easing.OutQuint)
+                .FadeOut(duration / 2, Easing.OutQuint);
+        }
+
+        protected override void OnSliderTick()
+        {
+            this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 1.08f, 40, Easing.OutQuint)
+                .Then()
+                .ScaleTo(DrawableSliderBall.FOLLOW_AREA, 200f, Easing.OutQuint);
+        }
+
+        protected override void OnSliderBreak()
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index dcd198c700..6815124056 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         case OsuSkinComponents.SliderBall:
                             return new ArgonSliderBall();
 
+                        case OsuSkinComponents.SliderFollowCircle:
+                            return new ArgonFollowCircle();
+
                         case OsuSkinComponents.SliderScorePoint:
                             return new ArgonSliderScorePoint();
 

From edc624c4beb63114772cc9e2de80c85bff91af16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 16:07:16 +0900
Subject: [PATCH 425/709] Tweak slider ball fade to be less present after
 slider ends

---
 .../Skinning/Argon/ArgonSliderBall.cs         | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
index 5c31f079d4..ae5c75549c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -1,11 +1,14 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -16,6 +19,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         private readonly Box fill;
         private readonly SpriteIcon icon;
 
+        private readonly Vector2 defaultIconScale = new Vector2(0.6f, 0.8f);
+
+        [Resolved(canBeNull: true)]
+        private DrawableHitObject? parentObject { get; set; }
+
         public ArgonSliderBall()
         {
             Size = new Vector2(ArgonMainCirclePiece.OUTER_GRADIENT_SIZE);
@@ -37,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 icon = new SpriteIcon
                 {
                     Size = new Vector2(48),
-                    Scale = new Vector2(0.6f, 0.8f),
+                    Scale = defaultIconScale,
                     Icon = FontAwesome.Solid.AngleRight,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -45,11 +53,57 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (parentObject != null)
+            {
+                parentObject.ApplyCustomUpdateState += updateStateTransforms;
+                updateStateTransforms(parentObject, parentObject.State.Value);
+            }
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableObject, ArmedState _)
+        {
+            // Gets called by slider ticks, tails, etc., leading to duplicated
+            // animations which in this case have no visual impact (due to
+            // instant fade) but may negatively affect performance
+            if (drawableObject is not DrawableSlider)
+                return;
+
+            const float duration = 200;
+            const float icon_scale = 0.9f;
+
+            using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
+            {
+                this.FadeInFromZero(duration, Easing.OutQuint);
+                icon.ScaleTo(0).Then().ScaleTo(defaultIconScale, duration, Easing.OutElasticHalf);
+            }
+
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
+                this.FadeOut(duration, Easing.OutQuint);
+                icon.ScaleTo(defaultIconScale * icon_scale, duration, Easing.OutQuint);
+            }
+        }
+
         protected override void Update()
         {
             base.Update();
 
-            fill.Rotation = -Rotation;
+            //undo rotation on layers which should not be rotated.
+            float appliedRotation = Parent.Rotation;
+
+            fill.Rotation = -appliedRotation;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (parentObject != null)
+                parentObject.ApplyCustomUpdateState -= updateStateTransforms;
         }
     }
 }

From 4eae5f87331ac25aa6a8e0b3ead84be786051157 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 16:14:35 +0900
Subject: [PATCH 426/709] Add back outer fill for hitcircles (but not slider
 head circles)

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs            | 11 +++++++++--
 .../Skinning/Argon/OsuArgonSkinTransformer.cs         |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index e4ed3d8fe8..9390c60977 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         public const float OUTER_GRADIENT_SIZE = OsuHitObject.OBJECT_RADIUS * 2 - BORDER_THICKNESS * 3;
 
+        private readonly Circle outerFill;
         private readonly Circle outerGradient;
         private readonly Circle innerGradient;
         private readonly Circle innerFill;
@@ -41,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         [Resolved]
         private DrawableHitObject drawableObject { get; set; } = null!;
 
-        public ArgonMainCirclePiece()
+        public ArgonMainCirclePiece(bool withOuterFill)
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
@@ -52,6 +53,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
+                outerFill = new Circle // renders white outer border and dark fill
+                {
+                    Size = Size,
+                    Alpha = withOuterFill ? 1 : 0,
+                },
                 outerGradient = new Circle // renders the outer bright gradient
                 {
                     Size = new Vector2(OUTER_GRADIENT_SIZE),
@@ -101,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             accentColour.BindValueChanged(colour =>
             {
-                innerFill.Colour = colour.NewValue.Darken(4);
+                outerFill.Colour = innerFill.Colour = colour.NewValue.Darken(4);
                 outerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue, colour.NewValue.Darken(0.1f));
                 innerGradient.Colour = ColourInfo.GradientVertical(colour.NewValue.Darken(0.5f), colour.NewValue.Darken(0.6f));
                 flash.Colour = colour.NewValue;
@@ -134,6 +140,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         // The fill layers add too much noise during the explosion animation.
                         // They will be hidden by the additive effects anyway.
+                        outerFill.FadeOut(flash_in_duration, Easing.OutQuint);
                         innerFill.FadeOut(flash_in_duration, Easing.OutQuint);
 
                         // The inner-most gradient should actually be resizing, but is only visible for
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 6815124056..8a1bf00877 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -28,8 +28,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     switch (osuComponent.Component)
                     {
                         case OsuSkinComponents.HitCircle:
+                            return new ArgonMainCirclePiece(true);
+
                         case OsuSkinComponents.SliderHeadHitCircle:
-                            return new ArgonMainCirclePiece();
+                            return new ArgonMainCirclePiece(false);
 
                         case OsuSkinComponents.SliderBody:
                             return new ArgonSliderBody();

From c8206b747b1488a65dc8d6b5f457a828648ced82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 17:05:36 +0900
Subject: [PATCH 427/709] Fix border / slider body metrics

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs        | 15 +++++++++------
 .../Skinning/Argon/ArgonSliderBall.cs             |  2 +-
 .../Skinning/Argon/ArgonSliderBody.cs             | 14 ++++++++------
 .../Skinning/Default/DrawableSliderPath.cs        |  4 ++--
 .../Skinning/Default/RingPiece.cs                 |  2 --
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 9390c60977..0479b3ff3e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -23,9 +23,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public class ArgonMainCirclePiece : CompositeDrawable
     {
-        public const float BORDER_THICKNESS = 7;
+        public const float BORDER_THICKNESS = (OsuHitObject.OBJECT_RADIUS * 2) * (2f / 58);
 
-        public const float OUTER_GRADIENT_SIZE = OsuHitObject.OBJECT_RADIUS * 2 - BORDER_THICKNESS * 3;
+        public const float GRADIENT_THICKNESS = BORDER_THICKNESS * 2.5f;
+
+        public const float OUTER_GRADIENT_SIZE = (OsuHitObject.OBJECT_RADIUS * 2) - BORDER_THICKNESS * 4;
+
+        public const float INNER_GRADIENT_SIZE = OUTER_GRADIENT_SIZE - GRADIENT_THICKNESS * 2;
+        public const float INNER_FILL_SIZE = INNER_GRADIENT_SIZE - GRADIENT_THICKNESS * 2;
 
         private readonly Circle outerFill;
         private readonly Circle outerGradient;
@@ -49,8 +54,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            const float fill_thickness = 24;
-
             InternalChildren = new Drawable[]
             {
                 outerFill = new Circle // renders white outer border and dark fill
@@ -67,14 +70,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 },
                 innerGradient = new Circle // renders the inner bright gradient
                 {
-                    Size = new Vector2(OUTER_GRADIENT_SIZE - fill_thickness),
+                    Size = new Vector2(INNER_GRADIENT_SIZE),
                     Alpha = 1,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
                 innerFill = new Circle // renders the inner dark fill
                 {
-                    Size = new Vector2(OUTER_GRADIENT_SIZE - 2 * fill_thickness),
+                    Size = new Vector2(INNER_FILL_SIZE),
                     Alpha = 1,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
index ae5c75549c..3df9edd225 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBall.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             Masking = true;
 
-            BorderThickness = ArgonMainCirclePiece.BORDER_THICKNESS * 2;
+            BorderThickness = ArgonMainCirclePiece.GRADIENT_THICKNESS;
             BorderColour = Color4.White;
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs
index 115e153f34..e1642d126d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderBody.cs
@@ -11,15 +11,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
     {
         protected override void LoadComplete()
         {
+            const float path_radius = ArgonMainCirclePiece.OUTER_GRADIENT_SIZE / 2;
+
             base.LoadComplete();
 
-            AccentColourBindable.BindValueChanged(accent =>
-            {
-                BorderColour = accent.NewValue;
-            }, true);
-            ScaleBindable.BindValueChanged(scale => PathRadius = ArgonMainCirclePiece.OUTER_GRADIENT_SIZE / 2 * scale.NewValue, true);
+            AccentColourBindable.BindValueChanged(accent => BorderColour = accent.NewValue, true);
+            ScaleBindable.BindValueChanged(scale => PathRadius = path_radius * scale.NewValue, true);
 
-            BorderSize = ArgonMainCirclePiece.BORDER_THICKNESS / 4;
+            // This border size thing is kind of weird, hey.
+            const float intended_thickness = ArgonMainCirclePiece.GRADIENT_THICKNESS / path_radius;
+
+            BorderSize = intended_thickness / Default.DrawableSliderPath.BORDER_PORTION;
         }
 
         protected override Default.DrawableSliderPath CreateSliderPath() => new DrawableSliderPath();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
index 94f93807d4..e3a83a9280 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DrawableSliderPath.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public abstract class DrawableSliderPath : SmoothPath
     {
-        protected const float BORDER_PORTION = 0.128f;
-        protected const float GRADIENT_PORTION = 1 - BORDER_PORTION;
+        public const float BORDER_PORTION = 0.128f;
+        public const float GRADIENT_PORTION = 1 - BORDER_PORTION;
 
         private const float border_max_size = 8f;
         private const float border_min_size = 0f;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
index c14246e90e..e813a7e274 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/RingPiece.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;

From 70d60a7e732d622f5e2068a6f43ce567b7c58a4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 17:18:14 +0900
Subject: [PATCH 428/709] Update import skin test in line with new default

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 3cbc205eaf..5c20f46787 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Tests.Skins.IO
             skinManager.CurrentSkinInfo.Value.PerformRead(s =>
             {
                 Assert.IsFalse(s.Protected);
-                Assert.AreEqual(typeof(TrianglesSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
 
                 new LegacySkinExporter(osu.Dependencies.Get<Storage>()).ExportModelTo(s, exportStream);
 
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Skins.IO
             {
                 Assert.IsFalse(s.Protected);
                 Assert.AreNotEqual(originalSkinId, s.ID);
-                Assert.AreEqual(typeof(TrianglesSkin), s.CreateInstance(skinManager).GetType());
+                Assert.AreEqual(typeof(ArgonSkin), s.CreateInstance(skinManager).GetType());
             });
 
             return Task.CompletedTask;

From b55aa68177b925b27b2147ace222ec052fc77e1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 22:46:55 +0900
Subject: [PATCH 429/709] Remove xmldoc on private fields

---
 osu.Game/Skinning/SkinManager.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 059767d8f8..0e66278fc0 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -39,6 +39,11 @@ namespace osu.Game.Skinning
     [ExcludeFromDynamicCompile]
     public class SkinManager : ModelManager<SkinInfo>, ISkinSource, IStorageResourceProvider, IModelImporter<SkinInfo>
     {
+        /// <summary>
+        /// The default "classic" skin.
+        /// </summary>
+        public Skin DefaultClassicSkin { get; }
+
         private readonly AudioManager audio;
 
         private readonly Scheduler scheduler;
@@ -55,21 +60,10 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> userFiles;
 
-        /// <summary>
-        /// The default "triangles" skin.
-        /// </summary>
         private Skin argonSkin { get; }
 
-        /// <summary>
-        /// The default skin (old).
-        /// </summary>
         private Skin trianglesSkin { get; }
 
-        /// <summary>
-        /// The default "classic" skin.
-        /// </summary>
-        public Skin DefaultClassicSkin { get; }
-
         public SkinManager(Storage storage, RealmAccess realm, GameHost host, IResourceStore<byte[]> resources, AudioManager audio, Scheduler scheduler)
             : base(storage, realm)
         {

From 03cc6b8af3ef954b46c9ba467bc60e4c8a9c4785 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Sep 2022 23:44:03 +0900
Subject: [PATCH 430/709] Fix parameter name

---
 osu.Game/Localisation/GeneralSettingsStrings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/GeneralSettingsStrings.cs b/osu.Game/Localisation/GeneralSettingsStrings.cs
index 8506971756..3278b20983 100644
--- a/osu.Game/Localisation/GeneralSettingsStrings.cs
+++ b/osu.Game/Localisation/GeneralSettingsStrings.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Localisation
         /// <summary>
         /// "You are running the latest release ({0})"
         /// </summary>
-        public static LocalisableString RunningLatestRelease(string arg0) => new TranslatableString(getKey(@"running_latest_release"), @"You are running the latest release ({0})", arg0);
+        public static LocalisableString RunningLatestRelease(string version) => new TranslatableString(getKey(@"running_latest_release"), @"You are running the latest release ({0})", version);
 
         private static string getKey(string key) => $"{prefix}:{key}";
     }

From 46db3ad96d0e1cd6ba4176b9b474cb79a338965d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 00:06:02 +0900
Subject: [PATCH 431/709] Move implementation to individual classes

---
 osu.Game/Screens/Play/Player.cs           | 26 ++++++++++++-----------
 osu.Game/Screens/Play/ReplayPlayer.cs     | 10 +++++++++
 osu.Game/Screens/Play/SoloPlayer.cs       | 10 +++++++++
 osu.Game/Screens/Select/PlaySongSelect.cs | 17 ++++++++++-----
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e1530d7ea2..e31e18046e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -9,6 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -832,23 +833,24 @@ namespace osu.Game.Screens.Play
             HUDOverlay.HoldingForHUD.BindValueChanged(_ => updateLeaderboardExpandedState());
             LocalUserPlaying.BindValueChanged(_ => updateLeaderboardExpandedState(), true);
 
-            LoadComponentAsync(CreateGameplayLeaderboard(), leaderboard =>
+            var gameplayLeaderboard = CreateGameplayLeaderboard();
+
+            if (gameplayLeaderboard != null)
             {
-                if (!LoadedBeatmapSuccessfully)
-                    return;
+                LoadComponentAsync(gameplayLeaderboard, leaderboard =>
+                {
+                    if (!LoadedBeatmapSuccessfully)
+                        return;
 
-                leaderboard.Expanded.BindTo(LeaderboardExpandedState);
+                    leaderboard.Expanded.BindTo(LeaderboardExpandedState);
 
-                AddLeaderboardToHUD(leaderboard);
-            });
+                    AddLeaderboardToHUD(leaderboard);
+                });
+            }
         }
 
-        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
-
-        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => new SoloGameplayLeaderboard(Score.ScoreInfo.User)
-        {
-            Scores = { BindTarget = LeaderboardScores }
-        };
+        [CanBeNull]
+        protected virtual GameplayLeaderboard CreateGameplayLeaderboard() => null;
 
         protected virtual void AddLeaderboardToHUD(GameplayLeaderboard leaderboard) => HUDOverlay.LeaderboardFlow.Add(leaderboard);
 
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index e82238945b..163b9c593f 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
@@ -14,6 +15,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Play
@@ -55,6 +57,14 @@ namespace osu.Game.Screens.Play
         // Don't re-import replay scores as they're already present in the database.
         protected override Task ImportScore(Score score) => Task.CompletedTask;
 
+        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+
+        protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
+            new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+            {
+                Scores = { BindTarget = LeaderboardScores }
+            };
+
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 
         public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 565f256277..a36697c96e 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -5,12 +5,14 @@
 
 using System;
 using System.Diagnostics;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Solo;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.Play
 {
@@ -40,6 +42,14 @@ namespace osu.Game.Screens.Play
             return new CreateSoloScoreRequest(Beatmap.Value.BeatmapInfo, rulesetId, Game.VersionHash);
         }
 
+        public readonly BindableList<ScoreInfo> LeaderboardScores = new BindableList<ScoreInfo>();
+
+        protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
+            new SoloGameplayLeaderboard(Score.ScoreInfo.User)
+            {
+                Scores = { BindTarget = LeaderboardScores }
+            };
+
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 068f78172b..94e4215175 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
@@ -115,11 +114,19 @@ namespace osu.Game.Screens.Select
                 var replayGeneratingMod = Mods.Value.OfType<ICreateReplayData>().FirstOrDefault();
 
                 if (replayGeneratingMod != null)
-                    player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods));
+                {
+                    player = new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateScoreFromReplayData(beatmap, mods))
+                    {
+                        LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
+                    };
+                }
                 else
-                    player = new SoloPlayer();
-
-                ((IBindableList<ScoreInfo>)player.LeaderboardScores).BindTo(playBeatmapDetailArea.Leaderboard.Scores);
+                {
+                    player = new SoloPlayer
+                    {
+                        LeaderboardScores = { BindTarget = playBeatmapDetailArea.Leaderboard.Scores }
+                    };
+                }
 
                 return player;
             }

From 1c02fa839965ce673f823c4dc2e3def7caa2d181 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 00:08:06 +0900
Subject: [PATCH 432/709] Update comment to not mention horizontal plane

---
 osu.Game/Screens/Play/HUDOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 3e661e76f4..3fbb051c3b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -197,7 +197,7 @@ namespace osu.Game.Screens.Play
             // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
-                // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
+                // for now align some top components with the bottom-edge of the lowest top-anchored hud element.
                 if (element.Anchor.HasFlagFast(Anchor.y0))
                 {
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.

From 18fe37bb222c6a296a866da22ee569be46d36ea4 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Mon, 19 Sep 2022 17:25:35 +0200
Subject: [PATCH 433/709] Reverted changes

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 11fa751daf..956d0e0c14 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -108,14 +108,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             float halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
+                attemptCatch(new Fruit { X = -halfWidth + 1 });
+                attemptCatch(new Fruit { X = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
+                attemptCatch(new Fruit { X = -halfWidth - 1 });
+                attemptCatch(new Fruit { X = halfWidth + 1 });
             });
             checkPlate(2);
         }

From 4958421303567ec8817cc340ae78102ae2602ec8 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Mon, 19 Sep 2022 17:26:04 +0200
Subject: [PATCH 434/709] Moved X clamping from X to EffectiveX

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index c6d63f6b81..cd2b8348e2 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         [JsonIgnore]
         public float X
         {
-            set => originalX.Value = Math.Clamp(value, 0, CatchPlayfield.WIDTH);
+            set => originalX.Value = value;
         }
 
         private HitObjectProperty<float> xOffset;
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
         /// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
         /// </remarks>
-        public float EffectiveX => OriginalX + XOffset;
+        public float EffectiveX => Math.Clamp(OriginalX + XOffset, 0, CatchPlayfield.WIDTH);
 
         public double TimePreempt { get; set; } = 1000;
 

From 74056201e7903fd572bd1a4a9f580cd74db2c78a Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 19 Sep 2022 09:15:59 -0700
Subject: [PATCH 435/709] Return smoke key to key overlay

---
 osu.Game.Rulesets.Osu/OsuInputManager.cs    | 14 --------------
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index 6500ade7ea..9332aa679a 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -57,20 +57,6 @@ namespace osu.Game.Rulesets.Osu
             return base.HandleMouseTouchStateChange(e);
         }
 
-        public override void Attach(KeyCounterDisplay keyCounter)
-        {
-            var receptor = new ActionReceptor(keyCounter);
-
-            KeyBindingContainer.Add(receptor);
-
-            keyCounter.SetReceptor(receptor);
-            keyCounter.AddRange(new[]
-            {
-                new KeyCounterAction<OsuAction>(OsuAction.LeftButton),
-                new KeyCounterAction<OsuAction>(OsuAction.RightButton),
-            });
-        }
-
         private class OsuKeyBindingContainer : RulesetKeyBindingContainer
         {
             public bool AllowUserPresses = true;
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index ce87d8b6c0..1a97153f2f 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Rulesets.UI
 
         #region Key Counter Attachment
 
-        public virtual void Attach(KeyCounterDisplay keyCounter)
+        public void Attach(KeyCounterDisplay keyCounter)
         {
             var receptor = new ActionReceptor(keyCounter);
 

From c3b8e1d718a8e5c3bc259a752d39aa632a2359dc Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 19 Sep 2022 10:16:05 -0700
Subject: [PATCH 436/709] Fix test and spawn smoke immediately

---
 osu.Game.Rulesets.Osu/OsuInputManager.cs           |  1 -
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs            | 14 +++++++++-----
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs         |  4 ++++
 .../Visual/Gameplay/TestSceneGameplayRewinding.cs  |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index 9332aa679a..dec965e567 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -10,7 +10,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Osu
 {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index bada67816b..7359f6029e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -166,17 +166,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
+            Anchor = Anchor.TopLeft;
+            Origin = Anchor.TopLeft;
+
+            SmokeStartTime = Time.Current;
+
+            totalDistance = PointInterval;
+
             if (smokeContainer != null)
             {
                 smokeContainer.SmokeMoved += onSmokeMoved;
                 smokeContainer.SmokeEnded += onSmokeEnded;
                 IsActive = true;
+
+                onSmokeMoved(smokeContainer.LastMousePosition, Time.Current);
             }
-
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
-
-            SmokeStartTime = Time.Current;
         }
 
         private Vector2 nextPointDirection()
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 07a073c3e5..2b5bddf959 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Rulesets.Osu.UI
         public event Action<Vector2, double>? SmokeMoved;
         public event Action<double>? SmokeEnded;
 
+        public Vector2 LastMousePosition;
+
         private bool isSmoking;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
@@ -50,6 +52,8 @@ namespace osu.Game.Rulesets.Osu.UI
             if (isSmoking)
                 SmokeMoved?.Invoke(e.MousePosition, Time.Current);
 
+            LastMousePosition = e.MousePosition;
+
             return base.OnMouseMove(e);
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 0a32513834..bd55ed8bd6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
             addSeekStep(3000);
             AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses >= 7));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Select(kc => kc.CountPresses).Sum() == 15);
             AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
             AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));

From b0a3c9152a413a7467aceb9c0a2634e5dcc7f902 Mon Sep 17 00:00:00 2001
From: B3nn1 <benjamin@koch-1.de>
Date: Mon, 19 Sep 2022 21:33:38 +0200
Subject: [PATCH 437/709] Enable snapping for slider control points in the
 editor

---
 .../Sliders/Components/PathControlPointVisualiser.cs     | 9 ++++++++-
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs  | 3 ++-
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs  | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index c24f78e430..9de62d1a46 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -307,7 +307,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 {
                     var controlPoint = controlPoints[i];
                     if (selectedControlPoints.Contains(controlPoint))
-                        controlPoint.Position = dragStartPositions[i] + (e.MousePosition - e.MouseDownPosition);
+                    {
+                        Vector2 newPosition = Parent.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
+                        var result = snapProvider?.FindSnappedPositionAndTime(newPosition);
+
+                        Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? newPosition) - slider.Position;
+
+                        controlPoint.Position = dragStartPositions[i] + movementDelta;
+                    }
                 }
             }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index e2f98c273e..dd5335a743 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -198,7 +198,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 }
 
                 // Update the cursor position.
-                cursor.Position = ToLocalSpace(inputManager.CurrentState.Mouse.Position) - HitObject.Position;
+                var result = snapProvider?.FindSnappedPositionAndTime(inputManager.CurrentState.Mouse.Position);
+                cursor.Position = ToLocalSpace(result?.ScreenSpacePosition ?? inputManager.CurrentState.Mouse.Position) - HitObject.Position;
             }
             else if (cursor != null)
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index eb69efd636..5673dab7e8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -163,7 +163,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected override void OnDrag(DragEvent e)
         {
             if (placementControlPoint != null)
-                placementControlPoint.Position = e.MousePosition - HitObject.Position;
+            {
+                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+                placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? e.MousePosition) - HitObject.Position;
+            }
         }
 
         protected override void OnMouseUp(MouseUpEvent e)

From a9c120c2145ecba824d511dcc94bca3367f05640 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 12:46:35 +0900
Subject: [PATCH 438/709] Reduce volume requirement for showing muted
 notification to 1%

---
 osu.Game/Screens/Play/PlayerLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6373633b5a..1491567cab 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -502,7 +502,7 @@ namespace osu.Game.Screens.Play
 
         private int restartCount;
 
-        private const double volume_requirement = 0.05;
+        private const double volume_requirement = 0.01;
 
         private void showMuteWarningIfNeeded()
         {

From b5771ece41ca51db56c6fd57ca63c4d7e2282fa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 12:52:04 +0900
Subject: [PATCH 439/709] Reduce the amount by which clicking the mute
 notification incraeses volume

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs                   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 1d101383cc..6b24ac7384 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -264,13 +264,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestMutedNotificationMasterVolume()
         {
-            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.IsDefault);
+            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, () => audioManager.Volume.Value == 0.5);
         }
 
         [Test]
         public void TestMutedNotificationTrackVolume()
         {
-            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.IsDefault);
+            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, () => audioManager.VolumeTrack.Value == 0.5);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 1491567cab..e32d3d90be 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -539,10 +539,11 @@ namespace osu.Game.Screens.Play
                     volumeOverlay.IsMuted.Value = false;
 
                     // Check values before resetting, as the user may have only had mute enabled, in which case we might not need to adjust volumes.
+                    // Note that we only restore halfway to ensure the user isn't suddenly overloaded by unexpectedly high volume.
                     if (audioManager.Volume.Value <= volume_requirement)
-                        audioManager.Volume.SetDefault();
+                        audioManager.Volume.Value = 0.5f;
                     if (audioManager.VolumeTrack.Value <= volume_requirement)
-                        audioManager.VolumeTrack.SetDefault();
+                        audioManager.VolumeTrack.Value = 0.5f;
 
                     return true;
                 };

From d22d009fb33a97df29dc1b9759c3c625a95259c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= <azusa@binary0.jp>
Date: Tue, 20 Sep 2022 14:02:11 +0900
Subject: [PATCH 440/709] fix review points. items not included in this
 localization were reverted.

---
 .../MaintenanceSettingsStrings.cs             | 30 -------------------
 .../MassDeleteConfirmationDialog.cs           |  3 +-
 .../MassVideoDeleteConfirmationDialog.cs      |  3 +-
 .../StableDirectoryLocationDialog.cs          |  9 +++---
 .../StableDirectorySelectScreen.cs            |  3 +-
 5 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Localisation/MaintenanceSettingsStrings.cs b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
index 4648682e64..8aa0adf7a0 100644
--- a/osu.Game/Localisation/MaintenanceSettingsStrings.cs
+++ b/osu.Game/Localisation/MaintenanceSettingsStrings.cs
@@ -134,36 +134,6 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString RestoredAllDeletedModPresets => new TranslatableString(getKey(@"restored_all_deleted_mod_presets"), @"Restored all deleted mod presets!");
 
-        /// <summary>
-        /// "Everything?"
-        /// </summary>
-        public static LocalisableString MassDeleteConfirmation => new TranslatableString(getKey(@"mass_delete_confirmation"), @"Everything?");
-
-        /// <summary>
-        /// "All beatmap videos? This cannot be undone!"
-        /// </summary>
-        public static LocalisableString MassVideoDeleteConfirmation => new TranslatableString(getKey(@"mass_video_delete_confirmation"), @"All beatmap videos? This cannot be undone!");
-
-        /// <summary>
-        /// "Failed to automatically locate an osu!stable installation."
-        /// </summary>
-        public static LocalisableString StableDirectoryLocationHeader => new TranslatableString(getKey(@"stable_directory_location_header"), @"Failed to automatically locate an osu!stable installation.");
-
-        /// <summary>
-        /// "An existing install could not be located. If you know where it is, you can help locate it."
-        /// </summary>
-        public static LocalisableString StableDirectoryLocationBody => new TranslatableString(getKey(@"stable_directory_location_body"), @"An existing install could not be located. If you know where it is, you can help locate it.");
-
-        /// <summary>
-        /// "Sure! I know where it is located!"
-        /// </summary>
-        public static LocalisableString StableDirectoryLocationOk => new TranslatableString(getKey(@"stable_directory_location_ok"), @"Sure! I know where it is located!");
-
-        /// <summary>
-        /// "Actually I don't have osu!stable installed."
-        /// </summary>
-        public static LocalisableString StableDirectoryLocationCancel => new TranslatableString(getKey(@"stable_directory_location_cancel"), @"Actually I don't have osu!stable installed.");
-
         /// <summary>
         /// "Please select your osu!stable install location"
         /// </summary>
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
index bcfccaa5e2..19e6f83dac 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MassDeleteConfirmationDialog.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Game.Localisation;
 using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
@@ -11,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         public MassDeleteConfirmationDialog(Action deleteAction)
         {
-            BodyText = MaintenanceSettingsStrings.MassDeleteConfirmation;
+            BodyText = "Everything?";
             DeleteAction = deleteAction;
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
index a386c64806..fc8c9d497b 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MassVideoDeleteConfirmationDialog.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -11,7 +10,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         public MassVideoDeleteConfirmationDialog(Action deleteAction)
             : base(deleteAction)
         {
-            BodyText = MaintenanceSettingsStrings.MassVideoDeleteConfirmation;
+            BodyText = "All beatmap videos? This cannot be undone!";
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 7b7ea7cee0..8aff4520b5 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
-using osu.Game.Localisation;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Screens;
 
@@ -20,20 +19,20 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
-            HeaderText = MaintenanceSettingsStrings.StableDirectoryLocationHeader;
-            BodyText = MaintenanceSettingsStrings.StableDirectoryLocationBody;
+            HeaderText = "Failed to automatically locate an osu!stable installation.";
+            BodyText = "An existing install could not be located. If you know where it is, you can help locate it.";
             Icon = FontAwesome.Solid.QuestionCircle;
 
             Buttons = new PopupDialogButton[]
             {
                 new PopupDialogOkButton
                 {
-                    Text = MaintenanceSettingsStrings.StableDirectoryLocationOk,
+                    Text = "Sure! I know where it is located!",
                     Action = () => Schedule(() => performer.PerformFromScreen(screen => screen.Push(new StableDirectorySelectScreen(taskCompletionSource))))
                 },
                 new PopupDialogCancelButton
                 {
-                    Text = MaintenanceSettingsStrings.StableDirectoryLocationCancel,
+                    Text = "Actually I don't have osu!stable installed.",
                     Action = () => taskCompletionSource.TrySetCanceled()
                 }
             };
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 22cf2e7076..047d589689 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -8,7 +8,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Localisation;
 using osu.Framework.Screens;
-using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -20,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
-        public override LocalisableString HeaderText => MaintenanceSettingsStrings.StableDirectorySelectHeader;
+        public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
         public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
         {

From 700000b583d4beb19b537a5e25d17c38fb54d64f Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 15:51:56 +0900
Subject: [PATCH 441/709] Use custom notification with timer

---
 .../Online/Multiplayer/MultiplayerClient.cs   |  7 +--
 .../Multiplayer/ServerShutdownNotification.cs | 49 +++++++++++++++++++
 osu.Game/Utils/HumanizerUtils.cs              | 23 +++++++++
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/ServerShutdownNotification.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index f9236cbfac..75334952f0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -589,12 +589,7 @@ namespace osu.Game.Online.Multiplayer
             if (countdown == null)
                 return;
 
-            PostNotification?.Invoke(new SimpleNotification
-            {
-                Text = countdown.FinalNotification
-                    ? $"The multiplayer server is restarting in {countdown.TimeRemaining:hh\\:mm\\:ss}. This multiplayer room will be closed shortly."
-                    : $"The multiplayer server is restarting in {countdown.TimeRemaining:hh\\:mm\\:ss}."
-            });
+            PostNotification?.Invoke(new ServerShutdownNotification(countdown.TimeRemaining));
         }
 
         Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
diff --git a/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
new file mode 100644
index 0000000000..dc61fe4ce5
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
@@ -0,0 +1,49 @@
+// 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 Humanizer.Localisation;
+using osu.Framework.Allocation;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Utils;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public class ServerShutdownNotification : SimpleNotification
+    {
+        private readonly DateTimeOffset endDate;
+
+        public ServerShutdownNotification(TimeSpan duration)
+        {
+            endDate = DateTimeOffset.UtcNow + duration;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateTime();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Scheduler.Add(updateTimeWithReschedule);
+        }
+
+        private void updateTimeWithReschedule()
+        {
+            updateTime();
+
+            // The remaining time on a countdown may be at a fractional portion between two seconds.
+            // We want to align certain audio/visual cues to the point at which integer seconds change.
+            // To do so, we schedule to the next whole second. Note that scheduler invocation isn't
+            // guaranteed to be accurate, so this may still occur slightly late, but even in such a case
+            // the next invocation will be roughly correct.
+            double timeToNextSecond = endDate.Subtract(DateTimeOffset.UtcNow).TotalMilliseconds % 1000;
+
+            Scheduler.AddDelayed(updateTimeWithReschedule, timeToNextSecond);
+        }
+
+        private void updateTime() => Text = $"The multiplayer server is restarting in {HumanizerUtils.Humanize(endDate.Subtract(DateTimeOffset.Now), precision: 2, minUnit: TimeUnit.Second)}.";
+    }
+}
diff --git a/osu.Game/Utils/HumanizerUtils.cs b/osu.Game/Utils/HumanizerUtils.cs
index 5b7c3630d9..0da346ed73 100644
--- a/osu.Game/Utils/HumanizerUtils.cs
+++ b/osu.Game/Utils/HumanizerUtils.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using Humanizer;
+using Humanizer.Localisation;
 
 namespace osu.Game.Utils
 {
@@ -26,5 +27,27 @@ namespace osu.Game.Utils
                 return input.Humanize(culture: new CultureInfo("en-US"));
             }
         }
+
+        /// <summary>
+        /// Turns the current or provided timespan into a human readable sentence
+        /// </summary>
+        /// <param name="input">The date to be humanized</param>
+        /// <param name="precision">The maximum number of time units to return. Defaulted is 1 which means the largest unit is returned</param>
+        /// <param name="maxUnit">The maximum unit of time to output. The default value is <see cref="TimeUnit.Week"/>. The time units <see cref="TimeUnit.Month"/> and <see cref="TimeUnit.Year"/> will give approximations for time spans bigger 30 days by calculating with 365.2425 days a year and 30.4369 days a month.</param>
+        /// <param name="minUnit">The minimum unit of time to output.</param>
+        /// <param name="toWords">Uses words instead of numbers if true. E.g. one day.</param>
+        /// <returns>distance of time in words</returns>
+        public static string Humanize(TimeSpan input, int precision = 1, TimeUnit maxUnit = TimeUnit.Week, TimeUnit minUnit = TimeUnit.Millisecond, bool toWords = false)
+        {
+            // this works around https://github.com/xamarin/xamarin-android/issues/2012 and https://github.com/Humanizr/Humanizer/issues/690#issuecomment-368536282
+            try
+            {
+                return input.Humanize(precision: precision, maxUnit: maxUnit, minUnit: minUnit);
+            }
+            catch (ArgumentException)
+            {
+                return input.Humanize(culture: new CultureInfo("en-US"), precision: precision, maxUnit: maxUnit, minUnit: minUnit);
+            }
+        }
     }
 }

From ef29987f362bc51c39b43af4f4d6d4ca7f721652 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 15:52:20 +0900
Subject: [PATCH 442/709] Remove FinalNotification

---
 osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs b/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs
index 4def3acc5e..b0a45dc768 100644
--- a/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs
+++ b/osu.Game/Online/Multiplayer/ServerShuttingDownCountdown.cs
@@ -11,10 +11,5 @@ namespace osu.Game.Online.Multiplayer
     [MessagePackObject]
     public class ServerShuttingDownCountdown : MultiplayerCountdown
     {
-        /// <summary>
-        /// If this is the final notification, no more <see cref="ServerShuttingDownCountdown"/> events will be sent after this.
-        /// </summary>
-        [Key(2)]
-        public bool FinalNotification { get; set; }
     }
 }

From b84f716c22f192ae67907232715c7ae3d87ae67b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 16:02:28 +0900
Subject: [PATCH 443/709] Display seconds when hours>0 to be more lively

---
 osu.Game/Online/Multiplayer/ServerShutdownNotification.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
index dc61fe4ce5..7241341bc9 100644
--- a/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
+++ b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
@@ -44,6 +44,6 @@ namespace osu.Game.Online.Multiplayer
             Scheduler.AddDelayed(updateTimeWithReschedule, timeToNextSecond);
         }
 
-        private void updateTime() => Text = $"The multiplayer server is restarting in {HumanizerUtils.Humanize(endDate.Subtract(DateTimeOffset.Now), precision: 2, minUnit: TimeUnit.Second)}.";
+        private void updateTime() => Text = $"The multiplayer server is restarting in {HumanizerUtils.Humanize(endDate.Subtract(DateTimeOffset.Now), precision: 3, minUnit: TimeUnit.Second)}.";
     }
 }

From 68c040175a4f026ca450f07fa060f9b86d16c962 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 17:01:44 +0900
Subject: [PATCH 444/709] Ensure `Leaderboard.Scores` is updated immediately
 via request flow

---
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 22 +++++++++++++------
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 13 +++++------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 9b6e9fbec7..d5834c4329 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -185,14 +185,22 @@ namespace osu.Game.Online.Leaderboards
             if (scores != null)
                 this.scores.AddRange(scores);
 
-            userScoreContainer.Score.Value = userScore;
+            // Schedule needs to be non-delayed here for the weird logic in refetchScores to work.
+            // If it is removed, the placeholder will be incorrectly updated to "no scores" rather than "retrieving".
+            // This whole flow should be refactored in the future.
+            Scheduler.Add(applyNewScores, false);
 
-            if (userScore == null)
-                userScoreContainer.Hide();
-            else
-                userScoreContainer.Show();
+            void applyNewScores()
+            {
+                userScoreContainer.Score.Value = userScore;
 
-            Scheduler.Add(updateScoresDrawables, false);
+                if (userScore == null)
+                    userScoreContainer.Hide();
+                else
+                    userScoreContainer.Show();
+
+                updateScoresDrawables();
+            }
         }
 
         /// <summary>
@@ -212,8 +220,8 @@ namespace osu.Game.Online.Leaderboards
             Debug.Assert(ThreadSafety.IsUpdateThread);
 
             cancelPendingWork();
-            SetScores(null);
 
+            SetScores(null);
             setState(LeaderboardState.Retrieving);
 
             currentFetchCancellationSource = new CancellationTokenSource();
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index ed4da5e848..798cf29715 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -148,13 +148,10 @@ namespace osu.Game.Screens.Select.Leaderboards
 
             var req = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
 
-            req.Success += r => Schedule(() =>
-            {
-                SetScores(
-                    scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
-                    r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
-                );
-            });
+            req.Success += r => SetScores(
+                scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+                r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+            );
 
             return req;
         }
@@ -209,7 +206,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
                 scores = scoreManager.OrderByTotalScore(scores.Detach());
 
-                Schedule(() => SetScores(scores));
+                SetScores(scores);
             }
         }
 

From e0f1f1a5e1fe26fa17402a57a8d432b7230e608c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 17:20:47 +0900
Subject: [PATCH 445/709] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 77c29a5d6e..4f69d27df6 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.920.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.916.1" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 29e690a024..3c24250300 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.920.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 83410b08f6..b57256dec9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.916.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.920.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
   <PropertyGroup>

From 90a05f4bed05cb3ed017e9fc3c92d04daddd816b Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Tue, 20 Sep 2022 01:40:20 -0700
Subject: [PATCH 446/709] Cap smoke on point count + omit invisible vertices

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 7359f6029e..70913b0851 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private float totalDistance;
         private Vector2? lastPosition;
 
-        private const double max_duration = 60_000;
+        private const int max_point_count = 72_000;
 
         public override float Height
         {
@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             lastPosition = position;
 
-            if (time - SmokeStartTime > max_duration)
+            if (SmokePoints.Count >= max_point_count)
                 onSmokeEnded(time);
         }
 
@@ -360,7 +360,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 if (Points.Count == 0)
                     return;
 
-                QuadBatch ??= renderer.CreateQuadBatch<TexturedVertex2D>(7200, 10);
+                QuadBatch ??= renderer.CreateQuadBatch<TexturedVertex2D>(max_point_count / 10, 10);
                 Texture ??= renderer.WhitePixel;
 
                 var shader = GetAppropriateShader(renderer);
@@ -410,6 +410,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 var dir = PointDirection(point);
                 var ortho = dir.PerpendicularLeft;
 
+                if (color.A == 0 || scale == 0)
+                    return;
+
                 var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
                 var localTopRight = point.Position + (Radius * scale * (-ortho + dir)) - PositionOffset;
                 var localBotLeft = point.Position + (Radius * scale * (ortho - dir)) - PositionOffset;

From fc6ab9c6a96b7a7892e77ae8449eb7edc372375e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Sep 2022 17:42:39 +0900
Subject: [PATCH 447/709] Add test coverage of shutdown notifications

---
 .../UserInterface/TestSceneNotificationOverlay.cs      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index e978b57ba4..4f980dc74f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.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.Linq;
 using NUnit.Framework;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Updater;
@@ -422,6 +424,14 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddRepeatStep("send barrage", sendBarrage, 10);
         }
 
+        [Test]
+        public void TestServerShuttingDownNotification()
+        {
+            AddStep("post with 5 seconds", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromSeconds(5))));
+            AddStep("post with 30 seconds", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromSeconds(30))));
+            AddStep("post with 6 hours", () => notificationOverlay.Post(new ServerShutdownNotification(TimeSpan.FromHours(6))));
+        }
+
         protected override void Update()
         {
             base.Update();

From 979f7f88a17d248d4db249e3caf99c3885d23001 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Tue, 20 Sep 2022 12:41:06 +0200
Subject: [PATCH 448/709] Fixed TestCatcherWidth and added
 TestFruitClampedToCatchableRegion

---
 .../TestSceneCatcher.cs                       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 956d0e0c14..732184a8a8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -106,20 +106,32 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestCatcherCatchWidth()
         {
             float halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
+            const float center_x = CatchPlayfield.CENTER_X;
+            AddStep("move catcher to center", () => catcher.X = center_x);
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth + 1 });
-                attemptCatch(new Fruit { X = halfWidth - 1 });
+                attemptCatch(new Fruit { X = center_x + -halfWidth + 1 });
+                attemptCatch(new Fruit { X = center_x + halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth - 1 });
-                attemptCatch(new Fruit { X = halfWidth + 1 });
+                attemptCatch(new Fruit { X = center_x + -halfWidth - 1 });
+                attemptCatch(new Fruit { X = center_x + halfWidth + 1 });
             });
             checkPlate(2);
         }
 
+        [Test]
+        public void TestFruitClampedToCatchableRegion()
+        {
+            AddStep("catch fruit left", () => attemptCatch(new Fruit { X = -CatchPlayfield.WIDTH }));
+            checkPlate(1);
+            AddStep("move catcher to right", () => catcher.X = CatchPlayfield.WIDTH);
+            AddStep("catch fruit right", () => attemptCatch(new Fruit { X = CatchPlayfield.WIDTH * 2 }));
+            checkPlate(2);
+        }
+
         [Test]
         public void TestFruitChangesCatcherState()
         {

From d777afc4542820c6df82e558536a9b8e16d6058b Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 19:53:39 +0900
Subject: [PATCH 449/709] Remove countdown at under 5 seconds

---
 .../Multiplayer/ServerShutdownNotification.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
index 7241341bc9..c114741be8 100644
--- a/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
+++ b/osu.Game/Online/Multiplayer/ServerShutdownNotification.cs
@@ -4,6 +4,7 @@
 using System;
 using Humanizer.Localisation;
 using osu.Framework.Allocation;
+using osu.Framework.Threading;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Utils;
 
@@ -12,6 +13,7 @@ namespace osu.Game.Online.Multiplayer
     public class ServerShutdownNotification : SimpleNotification
     {
         private readonly DateTimeOffset endDate;
+        private ScheduledDelegate? updateDelegate;
 
         public ServerShutdownNotification(TimeSpan duration)
         {
@@ -27,7 +29,7 @@ namespace osu.Game.Online.Multiplayer
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Scheduler.Add(updateTimeWithReschedule);
+            updateDelegate = Scheduler.Add(updateTimeWithReschedule);
         }
 
         private void updateTimeWithReschedule()
@@ -41,9 +43,20 @@ namespace osu.Game.Online.Multiplayer
             // the next invocation will be roughly correct.
             double timeToNextSecond = endDate.Subtract(DateTimeOffset.UtcNow).TotalMilliseconds % 1000;
 
-            Scheduler.AddDelayed(updateTimeWithReschedule, timeToNextSecond);
+            updateDelegate = Scheduler.AddDelayed(updateTimeWithReschedule, timeToNextSecond);
         }
 
-        private void updateTime() => Text = $"The multiplayer server is restarting in {HumanizerUtils.Humanize(endDate.Subtract(DateTimeOffset.Now), precision: 3, minUnit: TimeUnit.Second)}.";
+        private void updateTime()
+        {
+            TimeSpan remaining = endDate.Subtract(DateTimeOffset.Now);
+
+            if (remaining.TotalSeconds <= 5)
+            {
+                updateDelegate?.Cancel();
+                Text = "The multiplayer server will be right back...";
+            }
+            else
+                Text = $"The multiplayer server is restarting in {HumanizerUtils.Humanize(remaining, precision: 3, minUnit: TimeUnit.Second)}.";
+        }
     }
 }

From 5d73de9021d947346786b356373b6cdd25833556 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:20:32 +0900
Subject: [PATCH 450/709] Perform matrix mults on the GPU

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 70913b0851..58ba8ba0b1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -366,14 +366,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 var shader = GetAppropriateShader(renderer);
 
                 renderer.SetBlend(BlendingParameters.Additive);
+                renderer.PushLocalMatrix(DrawInfo.Matrix);
 
                 shader.Bind();
                 Texture.Bind();
 
                 UpdateDrawVariables(renderer);
-                UpdateVertexBuffer();
+                UpdateVertexBuffer(renderer);
 
                 shader.Unbind();
+                renderer.PopLocalMatrix();
             }
 
             protected Color4 ColorAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
@@ -395,7 +397,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 TextureRect = Texture.GetTextureRect();
             }
 
-            protected virtual void UpdateVertexBuffer()
+            protected virtual void UpdateVertexBuffer(IRenderer renderer)
             {
                 foreach (var point in Points)
                     drawPointQuad(point);
@@ -420,25 +422,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 QuadBatch.Add(new TexturedVertex2D
                 {
-                    Position = Vector2Extensions.Transform(localTopLeft, DrawInfo.Matrix),
+                    Position = localTopLeft,
                     TexturePosition = TextureRect.TopLeft,
                     Colour = Color4Extensions.Multiply(ColorAtPosition(localTopLeft), color),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
-                    Position = Vector2Extensions.Transform(localTopRight, DrawInfo.Matrix),
+                    Position = localTopRight,
                     TexturePosition = TextureRect.TopRight,
                     Colour = Color4Extensions.Multiply(ColorAtPosition(localTopRight), color),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
-                    Position = Vector2Extensions.Transform(localBotRight, DrawInfo.Matrix),
+                    Position = localBotRight,
                     TexturePosition = TextureRect.BottomRight,
                     Colour = Color4Extensions.Multiply(ColorAtPosition(localBotRight), color),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
-                    Position = Vector2Extensions.Transform(localBotLeft, DrawInfo.Matrix),
+                    Position = localBotLeft,
                     TexturePosition = TextureRect.BottomLeft,
                     Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color),
                 });

From f7962c993d88b9072d749cfad8814e43980b8afa Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:36:44 +0900
Subject: [PATCH 451/709] Reduce the number of points

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 58ba8ba0b1..80341c5ef1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private float totalDistance;
         private Vector2? lastPosition;
 
-        private const int max_point_count = 72_000;
+        private const int max_point_count = 18_000;
 
         public override float Height
         {

From 5d3c6efcc52ae54a2755d3bab0d95c948f1e74fa Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:38:22 +0900
Subject: [PATCH 452/709] Dispose quad batch

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 80341c5ef1..c07c2f960f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -445,6 +445,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color),
                 });
             }
+
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                QuadBatch?.Dispose();
+            }
         }
     }
 }

From 9f23210e7efbea97cda8b56bb73786fb99b8dff3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:39:12 +0900
Subject: [PATCH 453/709] Use British-English

---
 .../Skinning/Default/DefaultSmoke.cs            |  2 +-
 .../Skinning/Legacy/LegacySmoke.cs              |  2 +-
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs         | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 6eebd18305..85d1018b7f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
             }
 
-            protected override Color4 PointColor(SmokePoint point)
+            protected override Color4 PointColour(SmokePoint point)
             {
                 var color = Color4.White;
                 color.A = alpha;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index d8c3ff3521..d3ce294696 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
             }
 
-            protected override Color4 PointColor(SmokePoint point)
+            protected override Color4 PointColour(SmokePoint point)
             {
                 var color = Color4.White;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index c07c2f960f..63a370981e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -315,7 +315,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             protected new Smoke Source => (Smoke)base.Source;
 
             protected IVertexBatch<TexturedVertex2D>? QuadBatch;
-
             protected readonly List<SmokePoint> Points = new List<SmokePoint>();
 
             protected float Radius;
@@ -378,11 +377,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 renderer.PopLocalMatrix();
             }
 
-            protected Color4 ColorAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
+            protected Color4 ColourAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
                 ? ((SRGBColour)DrawColourInfo.Colour).Linear
                 : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
 
-            protected abstract Color4 PointColor(SmokePoint point);
+            protected abstract Color4 PointColour(SmokePoint point);
 
             protected abstract float PointScale(SmokePoint point);
 
@@ -407,12 +406,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 Debug.Assert(QuadBatch != null);
 
-                var color = PointColor(point);
+                var colour = PointColour(point);
                 float scale = PointScale(point);
                 var dir = PointDirection(point);
                 var ortho = dir.PerpendicularLeft;
 
-                if (color.A == 0 || scale == 0)
+                if (colour.A == 0 || scale == 0)
                     return;
 
                 var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
@@ -424,25 +423,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 {
                     Position = localTopLeft,
                     TexturePosition = TextureRect.TopLeft,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopLeft), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localTopRight,
                     TexturePosition = TextureRect.TopRight,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopRight), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotRight,
                     TexturePosition = TextureRect.BottomRight,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotRight), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotLeft,
                     TexturePosition = TextureRect.BottomLeft,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localBotLeft), colour),
                 });
             }
 

From ff6e4e3a9644c03c211a3221cd263ca4edc97732 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:42:12 +0900
Subject: [PATCH 454/709] Privatise setters

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 63a370981e..19891c823d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -314,19 +314,19 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             protected new Smoke Source => (Smoke)base.Source;
 
-            protected IVertexBatch<TexturedVertex2D>? QuadBatch;
+            protected IVertexBatch<TexturedVertex2D>? QuadBatch { get; private set; }
             protected readonly List<SmokePoint> Points = new List<SmokePoint>();
 
-            protected float Radius;
-            protected Vector2 DrawSize;
-            protected Vector2 PositionOffset;
-            protected Texture? Texture;
+            protected float Radius { get; private set; }
+            protected Vector2 DrawSize { get; private set; }
+            protected Vector2 PositionOffset { get; private set; }
+            protected Texture? Texture { get; private set; }
 
-            protected double SmokeStartTime;
-            protected double SmokeEndTime;
-            protected double CurrentTime;
+            protected double SmokeStartTime { get; private set; }
+            protected double SmokeEndTime { get; private set; }
+            protected double CurrentTime { get; private set; }
 
-            protected RectangleF TextureRect;
+            protected RectangleF TextureRect { get; private set; }
 
             private IFrameBasedClock? clock;
 

From c28ed477e152c4dd1fb082b6aedb16bfffa7b6ec Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:54:49 +0900
Subject: [PATCH 455/709] Expose less stuff, clean up implementation

---
 .../Skinning/Default/DefaultSmoke.cs          |   5 +-
 .../Skinning/Legacy/LegacySmoke.cs            |   6 -
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs       | 148 +++++-------------
 3 files changed, 44 insertions(+), 115 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 85d1018b7f..a3c5733eb4 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Rendering;
 using osuTK;
 using osuTK.Graphics;
 
@@ -34,9 +33,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             {
             }
 
-            protected override void UpdateDrawVariables(IRenderer renderer)
+            public override void ApplyState()
             {
-                base.UpdateDrawVariables(renderer);
+                base.ApplyState();
 
                 fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
             }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index d3ce294696..50669cf79a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Rendering;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
 using osuTK;
@@ -99,11 +98,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                 initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
                 rotationSeed = Source.RotationSeed;
-            }
-
-            protected override void UpdateDrawVariables(IRenderer renderer)
-            {
-                base.UpdateDrawVariables(renderer);
 
                 rotationRNG = new Random(rotationSeed);
                 initialFadeOutTime = Math.Min(CurrentTime, SmokeEndTime);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 19891c823d..410ee7b4f0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Rendering;
 using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK;
@@ -41,57 +40,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
-        private Texture? texture;
+        protected Texture? Texture { get; set; }
 
-        protected Texture? Texture
-        {
-            get => texture;
-            set
-            {
-                texture = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
+        protected double SmokeStartTime { get; private set; } = double.MinValue;
 
-        private double smokeTimeStart = double.MinValue;
-
-        protected double SmokeStartTime
-        {
-            get => smokeTimeStart;
-            private set
-            {
-                if (smokeTimeStart == value)
-                    return;
-
-                smokeTimeStart = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
-
-        private double smokeTimeEnd = double.MaxValue;
-
-        protected double SmokeEndTime
-        {
-            get => smokeTimeEnd;
-            private set
-            {
-                if (smokeTimeEnd == value)
-                    return;
-
-                smokeTimeEnd = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
-
-        public override IFrameBasedClock Clock
-        {
-            get => base.Clock;
-            set
-            {
-                base.Clock = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
+        protected double SmokeEndTime { get; private set; } = double.MaxValue;
 
         private Vector2 topLeft;
 
@@ -104,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     return;
 
                 topLeft = value;
-                Invalidate();
+                Invalidate(Invalidation.Layout);
             }
         }
 
@@ -277,6 +230,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.Update();
 
             Position = TopLeft;
+
+            Invalidate(Invalidation.DrawNode);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -314,21 +269,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             protected new Smoke Source => (Smoke)base.Source;
 
-            protected IVertexBatch<TexturedVertex2D>? QuadBatch { get; private set; }
-            protected readonly List<SmokePoint> Points = new List<SmokePoint>();
-
-            protected float Radius { get; private set; }
-            protected Vector2 DrawSize { get; private set; }
-            protected Vector2 PositionOffset { get; private set; }
-            protected Texture? Texture { get; private set; }
-
             protected double SmokeStartTime { get; private set; }
             protected double SmokeEndTime { get; private set; }
             protected double CurrentTime { get; private set; }
 
-            protected RectangleF TextureRect { get; private set; }
-
-            private IFrameBasedClock? clock;
+            private readonly List<SmokePoint> points = new List<SmokePoint>();
+            private IVertexBatch<TexturedVertex2D>? quadBatch;
+            private float radius;
+            private Vector2 drawSize;
+            private Vector2 positionOffset;
+            private Texture? texture;
 
             protected SmokeDrawNode(ITexturedShaderDrawable source)
                 : base(source)
@@ -339,28 +289,29 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 base.ApplyState();
 
-                Points.Clear();
-                Points.AddRange(Source.SmokePoints);
+                points.Clear();
+                points.AddRange(Source.SmokePoints);
 
-                Radius = Source.Radius;
-                DrawSize = Source.DrawSize;
-                PositionOffset = Source.TopLeft;
-                Texture = Source.Texture;
-                clock = Source.Clock;
+                radius = Source.Radius;
+                drawSize = Source.DrawSize;
+                positionOffset = Source.TopLeft;
+                texture = Source.Texture;
 
                 SmokeStartTime = Source.SmokeStartTime;
                 SmokeEndTime = Source.SmokeEndTime;
+                CurrentTime = Source.Clock.CurrentTime;
             }
 
             public sealed override void Draw(IRenderer renderer)
             {
                 base.Draw(renderer);
 
-                if (Points.Count == 0)
+                if (points.Count == 0)
                     return;
 
-                QuadBatch ??= renderer.CreateQuadBatch<TexturedVertex2D>(max_point_count / 10, 10);
-                Texture ??= renderer.WhitePixel;
+                quadBatch ??= renderer.CreateQuadBatch<TexturedVertex2D>(max_point_count / 10, 10);
+                texture ??= renderer.WhitePixel;
+                RectangleF textureRect = texture.GetTextureRect();
 
                 var shader = GetAppropriateShader(renderer);
 
@@ -368,10 +319,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 renderer.PushLocalMatrix(DrawInfo.Matrix);
 
                 shader.Bind();
-                Texture.Bind();
+                texture.Bind();
 
-                UpdateDrawVariables(renderer);
-                UpdateVertexBuffer(renderer);
+                foreach (var point in points)
+                    drawPointQuad(point, textureRect);
 
                 shader.Unbind();
                 renderer.PopLocalMatrix();
@@ -379,7 +330,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             protected Color4 ColourAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
                 ? ((SRGBColour)DrawColourInfo.Colour).Linear
-                : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
+                : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, drawSize)).Linear;
 
             protected abstract Color4 PointColour(SmokePoint point);
 
@@ -387,24 +338,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             protected abstract Vector2 PointDirection(SmokePoint point);
 
-            protected virtual void UpdateDrawVariables(IRenderer renderer)
+            private void drawPointQuad(SmokePoint point, RectangleF textureRect)
             {
-                Debug.Assert(clock != null);
-                Debug.Assert(Texture != null);
-
-                CurrentTime = clock.CurrentTime;
-                TextureRect = Texture.GetTextureRect();
-            }
-
-            protected virtual void UpdateVertexBuffer(IRenderer renderer)
-            {
-                foreach (var point in Points)
-                    drawPointQuad(point);
-            }
-
-            private void drawPointQuad(SmokePoint point)
-            {
-                Debug.Assert(QuadBatch != null);
+                Debug.Assert(quadBatch != null);
 
                 var colour = PointColour(point);
                 float scale = PointScale(point);
@@ -414,33 +350,33 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 if (colour.A == 0 || scale == 0)
                     return;
 
-                var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
-                var localTopRight = point.Position + (Radius * scale * (-ortho + dir)) - PositionOffset;
-                var localBotLeft = point.Position + (Radius * scale * (ortho - dir)) - PositionOffset;
-                var localBotRight = point.Position + (Radius * scale * (ortho + dir)) - PositionOffset;
+                var localTopLeft = point.Position + (radius * scale * (-ortho - dir)) - positionOffset;
+                var localTopRight = point.Position + (radius * scale * (-ortho + dir)) - positionOffset;
+                var localBotLeft = point.Position + (radius * scale * (ortho - dir)) - positionOffset;
+                var localBotRight = point.Position + (radius * scale * (ortho + dir)) - positionOffset;
 
-                QuadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D
                 {
                     Position = localTopLeft,
-                    TexturePosition = TextureRect.TopLeft,
+                    TexturePosition = textureRect.TopLeft,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
                 });
-                QuadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D
                 {
                     Position = localTopRight,
-                    TexturePosition = TextureRect.TopRight,
+                    TexturePosition = textureRect.TopRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
                 });
-                QuadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotRight,
-                    TexturePosition = TextureRect.BottomRight,
+                    TexturePosition = textureRect.BottomRight,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
                 });
-                QuadBatch.Add(new TexturedVertex2D
+                quadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotLeft,
-                    TexturePosition = TextureRect.BottomLeft,
+                    TexturePosition = textureRect.BottomLeft,
                     Colour = Color4Extensions.Multiply(ColourAtPosition(localBotLeft), colour),
                 });
             }
@@ -448,7 +384,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
-                QuadBatch?.Dispose();
+                quadBatch?.Dispose();
             }
         }
     }

From 102c1409674733535121b8957d8194c6a2940515 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:59:58 +0900
Subject: [PATCH 456/709] Remove another invalidate

---
 .../Skinning/Legacy/LegacySmoke.cs                | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 50669cf79a..556996895c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -35,20 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private const float max_rotation = 0.25f;
 
-        private int rotationSeed = RNG.Next();
-
-        protected int RotationSeed
-        {
-            get => rotationSeed;
-            set
-            {
-                if (rotationSeed == value)
-                    return;
-
-                rotationSeed = value;
-                Invalidate(Invalidation.DrawNode);
-            }
-        }
+        protected int RotationSeed { get; set; } = RNG.Next();
 
         protected override double LifetimeAfterSmokeEnd
         {

From 3ec16063bdb017b7c07f11ed764023a47c1a4efb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 21:01:18 +0900
Subject: [PATCH 457/709] And another invalidate

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 410ee7b4f0..3afcc031a5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -30,14 +30,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected float Radius
         {
             get => radius ?? Texture?.DisplayWidth * 0.165f ?? 3;
-            set
-            {
-                if (radius == value)
-                    return;
-
-                radius = value;
-                Invalidate(Invalidation.DrawNode);
-            }
+            set => radius = value;
         }
 
         protected Texture? Texture { get; set; }

From ff568211528b63442f858dc459497cb4142c87c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 00:24:29 +0900
Subject: [PATCH 458/709] Change `SkinnableHUDComponentTestScene` to show new
 HUD twice

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 .../Visual/Gameplay/SkinnableHUDComponentTestScene.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
index 1bf1bd4c81..ea4aa98f86 100644
--- a/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             SetContents(skin =>
             {
-                var implementation = skin is not TrianglesSkin
+                var implementation = skin is LegacySkin
                     ? CreateLegacyImplementation()
                     : CreateDefaultImplementation();
 

From cb8ed1f1449fca16321da357d37505a9de073150 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 01:29:12 +0900
Subject: [PATCH 459/709] Adjust variables slightly for readability

---
 .../TestSceneCatcher.cs                         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 732184a8a8..182cc51572 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -106,18 +106,23 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestCatcherCatchWidth()
         {
             float halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
-            const float center_x = CatchPlayfield.CENTER_X;
-            AddStep("move catcher to center", () => catcher.X = center_x);
+
+            AddStep("move catcher to center", () => catcher.X = CatchPlayfield.CENTER_X);
+
+            float leftPlateBounds = CatchPlayfield.CENTER_X - halfWidth;
+            float rightPlateBounds = CatchPlayfield.CENTER_X + halfWidth;
+
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = center_x + -halfWidth + 1 });
-                attemptCatch(new Fruit { X = center_x + halfWidth - 1 });
+                attemptCatch(new Fruit { X = leftPlateBounds + 1 });
+                attemptCatch(new Fruit { X = rightPlateBounds - 1 });
             });
             checkPlate(2);
+
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = center_x + -halfWidth - 1 });
-                attemptCatch(new Fruit { X = center_x + halfWidth + 1 });
+                attemptCatch(new Fruit { X = leftPlateBounds - 1 });
+                attemptCatch(new Fruit { X = rightPlateBounds + 1 });
             });
             checkPlate(2);
         }

From ddbd69dc678fa10fe237186fc2a6aeaa352a80b7 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Tue, 20 Sep 2022 09:44:01 -0700
Subject: [PATCH 460/709] Replace LifetimeAfterSmokeEnd with abstract
 LifetimeEnd

---
 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs   | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index a3c5733eb4..65ae490882 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         private const double fade_out_duration = 50;
         private const float alpha = 0.5f;
 
-        protected override double LifetimeAfterSmokeEnd => fade_out_delay + fade_out_duration + (SmokeEndTime - SmokeStartTime) / fade_out_speed;
+        public override double LifetimeEnd => SmokeEndTime + fade_out_delay + fade_out_duration + (SmokeEndTime - SmokeStartTime) / fade_out_speed;
 
         public DefaultSmoke()
         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index 556996895c..f02c20fefb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -37,12 +37,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected int RotationSeed { get; set; } = RNG.Next();
 
-        protected override double LifetimeAfterSmokeEnd
+        public override double LifetimeEnd
         {
             get
             {
                 double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-                return final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
+                return SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 3afcc031a5..c381b543b3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -69,7 +69,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
-        protected abstract double LifetimeAfterSmokeEnd { get; }
         protected virtual float PointInterval => Radius * 7f / 8;
         protected bool IsActive { get; private set; }
 
@@ -206,6 +205,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 BottomRight = new Vector2(BottomRight.X, position.Y);
         }
 
+        public abstract override double LifetimeEnd { get; }
+
         private void onSmokeEnded(double time)
         {
             if (!IsActive)
@@ -213,7 +214,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             IsActive = false;
             SmokeEndTime = time;
-            LifetimeEnd = time + LifetimeAfterSmokeEnd + 100;
         }
 
         protected abstract override DrawNode CreateDrawNode();

From 6b1cd1bce353e8766711a12bb36d8bbad958841a Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Tue, 20 Sep 2022 19:13:40 +0200
Subject: [PATCH 461/709] Clamped JuiceStream to Playfield, but broke few tests

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 311e15116e..0f2ce2e5e3 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -11,6 +11,7 @@ using Newtonsoft.Json;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -84,8 +85,8 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = OriginalX + Path.PositionAt(
-                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
+                                X = EffectiveX + ClampToPlayField(Path.PositionAt(
+                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X),
                             });
                         }
                     }
@@ -102,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = EffectiveX + ClampToPlayField(Path.PositionAt(e.PathProgress).X),
                         });
                         break;
 
@@ -113,14 +114,16 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = EffectiveX + ClampToPlayField(Path.PositionAt(e.PathProgress).X),
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => OriginalX + this.CurvePositionAt(1).X;
+        public float EndX => EffectiveX + this.CurvePositionAt(1).X;
+
+        public float ClampToPlayField(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
 
         [JsonIgnore]
         public double Duration

From a4fae370135c046c1d847fec39e10a75b97421a1 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Tue, 20 Sep 2022 19:45:39 +0200
Subject: [PATCH 462/709] Fixed tests failing

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 0f2ce2e5e3..a0b6c7e724 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = EffectiveX + ClampToPlayField(Path.PositionAt(
+                                X = ClampToPlayField(EffectiveX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X),
                             });
                         }
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = EffectiveX + ClampToPlayField(Path.PositionAt(e.PathProgress).X),
+                            X = ClampToPlayField(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
 
@@ -114,14 +114,14 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = EffectiveX + ClampToPlayField(Path.PositionAt(e.PathProgress).X),
+                            X = ClampToPlayField(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => EffectiveX + this.CurvePositionAt(1).X;
+        public float EndX => ClampToPlayField(EffectiveX + this.CurvePositionAt(1).X);
 
         public float ClampToPlayField(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
 

From 092e6cfa1da050a5d16d0ac86fc95547f14eabbc Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Tue, 20 Sep 2022 12:03:07 -0700
Subject: [PATCH 463/709] Lock smoke bounds to playfield

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 86 ++-----------------------
 1 file changed, 5 insertions(+), 81 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index c381b543b3..4d2a193a8a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -39,36 +39,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected double SmokeEndTime { get; private set; } = double.MaxValue;
 
-        private Vector2 topLeft;
-
-        protected Vector2 TopLeft
-        {
-            get => topLeft;
-            set
-            {
-                if (topLeft == value)
-                    return;
-
-                topLeft = value;
-                Invalidate(Invalidation.Layout);
-            }
-        }
-
-        private Vector2 bottomRight;
-
-        protected Vector2 BottomRight
-        {
-            get => bottomRight;
-            set
-            {
-                if (bottomRight == value)
-                    return;
-
-                bottomRight = value;
-                Invalidate(Invalidation.Layout);
-            }
-        }
-
         protected virtual float PointInterval => Radius * 7f / 8;
         protected bool IsActive { get; private set; }
 
@@ -79,24 +49,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private const int max_point_count = 18_000;
 
-        public override float Height
-        {
-            get => base.Height = BottomRight.Y - TopLeft.Y;
-            set => throw new InvalidOperationException($"Cannot manually set {nameof(Height)} of {nameof(Smoke)}.");
-        }
-
-        public override float Width
-        {
-            get => base.Width = BottomRight.X - TopLeft.X;
-            set => throw new InvalidOperationException($"Cannot manually set {nameof(Width)} of {nameof(Smoke)}.");
-        }
-
-        public override Vector2 Size
-        {
-            get => base.Size = BottomRight - TopLeft;
-            set => throw new InvalidOperationException($"Cannot manually set {nameof(Size)} of {nameof(Smoke)}.");
-        }
-
         [Resolved(CanBeNull = true)]
         private SmokeContainer? smokeContainer { get; set; }
 
@@ -111,8 +63,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.LoadComplete();
 
-            Anchor = Anchor.TopLeft;
-            Origin = Anchor.TopLeft;
+            RelativeSizeAxes = Axes.Both;
 
             SmokeStartTime = Time.Current;
 
@@ -157,7 +108,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 {
                     int index = ~SmokePoints.BinarySearch(new SmokePoint { Time = time }, new SmokePoint.UpperBoundComparer());
                     SmokePoints.RemoveRange(index, SmokePoints.Count - index);
-                    recalculateBounds();
                 }
 
                 totalDistance %= PointInterval;
@@ -175,7 +125,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 }
 
                 Invalidate(Invalidation.DrawNode);
-                adaptBounds(position);
             }
 
             lastPosition = position;
@@ -184,27 +133,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 onSmokeEnded(time);
         }
 
-        private void recalculateBounds()
-        {
-            TopLeft = BottomRight = Vector2.Zero;
-
-            foreach (var point in SmokePoints)
-                adaptBounds(point.Position);
-        }
-
-        private void adaptBounds(Vector2 position)
-        {
-            if (position.X < TopLeft.X)
-                TopLeft = new Vector2(position.X, TopLeft.Y);
-            else if (position.X > BottomRight.X)
-                BottomRight = new Vector2(position.X, BottomRight.Y);
-
-            if (position.Y < TopLeft.Y)
-                TopLeft = new Vector2(TopLeft.X, position.Y);
-            else if (position.Y > BottomRight.Y)
-                BottomRight = new Vector2(BottomRight.X, position.Y);
-        }
-
         public abstract override double LifetimeEnd { get; }
 
         private void onSmokeEnded(double time)
@@ -222,8 +150,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.Update();
 
-            Position = TopLeft;
-
             Invalidate(Invalidation.DrawNode);
         }
 
@@ -270,7 +196,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             private IVertexBatch<TexturedVertex2D>? quadBatch;
             private float radius;
             private Vector2 drawSize;
-            private Vector2 positionOffset;
             private Texture? texture;
 
             protected SmokeDrawNode(ITexturedShaderDrawable source)
@@ -287,7 +212,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
                 radius = Source.Radius;
                 drawSize = Source.DrawSize;
-                positionOffset = Source.TopLeft;
                 texture = Source.Texture;
 
                 SmokeStartTime = Source.SmokeStartTime;
@@ -343,10 +267,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 if (colour.A == 0 || scale == 0)
                     return;
 
-                var localTopLeft = point.Position + (radius * scale * (-ortho - dir)) - positionOffset;
-                var localTopRight = point.Position + (radius * scale * (-ortho + dir)) - positionOffset;
-                var localBotLeft = point.Position + (radius * scale * (ortho - dir)) - positionOffset;
-                var localBotRight = point.Position + (radius * scale * (ortho + dir)) - positionOffset;
+                var localTopLeft = point.Position + (radius * scale * (-ortho - dir));
+                var localTopRight = point.Position + (radius * scale * (-ortho + dir));
+                var localBotLeft = point.Position + (radius * scale * (ortho - dir));
+                var localBotRight = point.Position + (radius * scale * (ortho + dir));
 
                 quadBatch.Add(new TexturedVertex2D
                 {

From b8f2e13503c8899880c065ac0f2bdba808674b23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 20 Sep 2022 22:27:27 +0300
Subject: [PATCH 464/709] Avoid catching all exceptions raising from skin
 instance creation

---
 osu.Game/Skinning/SkinInfo.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 34728245c8..04d1216ed6 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO;
@@ -45,20 +44,18 @@ namespace osu.Game.Skinning
             var type = string.IsNullOrEmpty(InstantiationInfo)
                 // handle the case of skins imported before InstantiationInfo was added.
                 ? typeof(LegacySkin)
-                : Type.GetType(InstantiationInfo).AsNonNull();
+                : Type.GetType(InstantiationInfo);
 
-            try
+            if (type == null)
             {
-                return (Skin)Activator.CreateInstance(type, this, resources);
-            }
-            catch
-            {
-                // Since the class was renamed from "DefaultSkin" to "TrianglesSkin", the instantiation would fail
+                // Since the class was renamed from "DefaultSkin" to "TrianglesSkin", the type retrieval would fail
                 // for user modified skins. This aims to amicably handle that.
                 // If we ever add more default skins in the future this will need some kind of proper migration rather than
-                // a single catch.
+                // a single fallback.
                 return new TrianglesSkin(this, resources);
             }
+
+            return (Skin)Activator.CreateInstance(type, this, resources);
         }
 
         public IList<RealmNamedFileUsage> Files { get; } = null!;

From b7c1e8cc5ace501a15384c45ec49b14d03d17573 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Tue, 20 Sep 2022 23:11:38 +0200
Subject: [PATCH 465/709] Remove setting `AngleVariety`

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index c829d1f696..e1ebecc6f2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -38,16 +38,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.1f
         };
 
-        [SettingSource("Angle variety", "The amount of variety in how sharp angles are", SettingControlType = typeof(SettingsSlider<float>))]
-        public BindableFloat AngleVariety { get; } = new BindableFloat
-        {
-            Default = 3,
-            Value = 3,
-            MinValue = 0,
-            MaxValue = 10,
-            Precision = 0.1f
-        };
-
         private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
 
         private Random random = null!;
@@ -111,7 +101,9 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private float getRandomOffset(float stdDev)
         {
-            float customMultiplier = AngleVariety.Value / AngleVariety.Default;
+            // Range: [0.5;2]
+            float customMultiplier = (1.5f * AngleSharpness.MaxValue - AngleSharpness.Value) / (1.5f * AngleSharpness.MaxValue - AngleSharpness.Default);
+
             return OsuHitObjectGenerationUtils.RandomGaussian(random, 0, stdDev * customMultiplier);
         }
 

From b1ecac514ad7fd0580878f02942d237e7c9763b0 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Tue, 20 Sep 2022 23:13:38 +0200
Subject: [PATCH 466/709] Correct comments

---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index e1ebecc6f2..78c7aa53f4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -101,7 +101,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private float getRandomOffset(float stdDev)
         {
-            // Range: [0.5;2]
+            // Range: [0.5, 2]
+            // Higher angle sharpness -> lower multiplier
             float customMultiplier = (1.5f * AngleSharpness.MaxValue - AngleSharpness.Value) / (1.5f * AngleSharpness.MaxValue - AngleSharpness.Default);
 
             return OsuHitObjectGenerationUtils.RandomGaussian(random, 0, stdDev * customMultiplier);
@@ -112,14 +113,14 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// <param name="flowDirection">Whether the relative angle should be positive or negative.</param>
         private float getRelativeTargetAngle(float targetDistance, float offset, bool flowDirection)
         {
-            // Range [0.1;1]
+            // Range: [0.1, 1]
             float angleSharpness = AngleSharpness.Value / AngleSharpness.MaxValue;
-            // Range [0;0.9]
+            // Range: [0, 0.9]
             float angleWideness = 1 - angleSharpness;
 
-            // Range: [-60;30]
+            // Range: [-60, 30]
             float customOffsetX = angleSharpness * 100 - 70;
-            // Range: [-0.075;0.15]
+            // Range: [-0.075, 0.15]
             float customOffsetY = angleWideness * 0.25f - 0.075f;
 
             targetDistance += customOffsetX;

From 8b918d29fc2e2387430eea1010b5c0ff01be93de Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Sep 2022 00:15:49 +0300
Subject: [PATCH 467/709] Add failing test case

---
 .../TestSceneNotificationOverlay.cs           | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index c8126d883c..19da31a91b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -230,6 +230,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait overlay not present", () => !notificationOverlay.IsPresent);
         }
 
+        [Test]
+        public void TestProgressClick()
+        {
+            ProgressNotification notification = null!;
+
+            AddStep("add progress notification", () =>
+            {
+                notification = new ProgressNotification
+                {
+                    Text = @"Uploading to BSS...",
+                    CompletionText = "Uploaded to BSS!",
+                };
+                notificationOverlay.Post(notification);
+                progressingNotifications.Add(notification);
+            });
+
+            AddStep("hover over notification", () => InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<ProgressNotification>().Single()));
+
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("not cancelled", () => notification.State == ProgressNotificationState.Active);
+
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddAssert("cancelled", () => notification.State == ProgressNotificationState.Cancelled);
+        }
+
         [Test]
         public void TestCompleteProgress()
         {

From dcfb6a2f060a1de3e86128080bae42d6d81935b7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Sep 2022 00:15:45 +0300
Subject: [PATCH 468/709] Fix progress notifications no longer blocking close
 on click

---
 osu.Game/Overlays/Notifications/Notification.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 4e7cebf0ae..ea654e1272 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -229,8 +229,8 @@ namespace osu.Game.Overlays.Notifications
         protected override bool OnClick(ClickEvent e)
         {
             // Clicking with anything but left button should dismiss but not perform the activation action.
-            if (e.Button == MouseButton.Left)
-                Activated?.Invoke();
+            if (e.Button == MouseButton.Left && Activated?.Invoke() == false)
+                return true;
 
             Close(false);
             return true;

From fe9e8635fc3424f635f0a6db04441abee170bb1a Mon Sep 17 00:00:00 2001
From: B3nn1 <benjamin@koch-1.de>
Date: Wed, 21 Sep 2022 01:04:39 +0200
Subject: [PATCH 469/709] Fix snapping of already existing slider control
 points in the editor

---
 .../Sliders/Components/PathControlPointVisualiser.cs     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 9de62d1a46..0dd522fd47 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -303,16 +303,15 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
+                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+
+                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - slider.Position;
+
                 for (int i = 0; i < controlPoints.Count; ++i)
                 {
                     var controlPoint = controlPoints[i];
                     if (selectedControlPoints.Contains(controlPoint))
                     {
-                        Vector2 newPosition = Parent.ToScreenSpace(e.MousePosition + (dragStartPositions[0] - dragStartPositions[draggedControlPointIndex]));
-                        var result = snapProvider?.FindSnappedPositionAndTime(newPosition);
-
-                        Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? newPosition) - slider.Position;
-
                         controlPoint.Position = dragStartPositions[i] + movementDelta;
                     }
                 }

From 368229f324bca76a9ea409f39f49c8a926e168d4 Mon Sep 17 00:00:00 2001
From: B3nn1 <benjamin@koch-1.de>
Date: Wed, 21 Sep 2022 01:25:01 +0200
Subject: [PATCH 470/709] Remove unnecessary brackets

---
 .../Blueprints/Sliders/Components/PathControlPointVisualiser.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 0dd522fd47..628329ba64 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -311,9 +311,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 {
                     var controlPoint = controlPoints[i];
                     if (selectedControlPoints.Contains(controlPoint))
-                    {
                         controlPoint.Position = dragStartPositions[i] + movementDelta;
-                    }
                 }
             }
 

From 29fa868fde5ab7162c742515150d7569977414b0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Sep 2022 03:03:34 +0300
Subject: [PATCH 471/709] Fix test scene not resetting mouse position

Also fixes until step flipped.
---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 19da31a91b..b314d95597 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            InputManager.MoveMouseTo(Vector2.Zero);
+
             TimeToCompleteProgress = 2000;
             progressingNotifications.Clear();
 
@@ -326,7 +328,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             SimpleNotification notification = null!;
             AddStep(@"post", () => notificationOverlay.Post(notification = new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" }));
-            AddUntilStep("check is toast", () => !notification.IsInToastTray);
+            AddUntilStep("check is toast", () => notification.IsInToastTray);
             AddAssert("light is not visible", () => notification.ChildrenOfType<Notification.NotificationLight>().Single().Alpha == 0);
 
             AddUntilStep("wait for forward to overlay", () => !notification.IsInToastTray);

From a8338c4efd5cf9dbb89b772850c30b557cee3125 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 13:38:40 +0900
Subject: [PATCH 472/709] Add local score after existing scores to avoid
 initial re-sort

---
 .../Play/HUD/SoloGameplayLeaderboard.cs        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 00efcb1ea9..eff7870d89 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -45,15 +45,6 @@ namespace osu.Game.Screens.Play.HUD
             if (!Scores.Any())
                 return;
 
-            ILeaderboardScore local = Add(trackingUser, true);
-
-            local.TotalScore.BindTarget = scoreProcessor.TotalScore;
-            local.Accuracy.BindTarget = scoreProcessor.Accuracy;
-            local.Combo.BindTarget = scoreProcessor.Combo;
-
-            // Local score should always show lower than any existing scores in cases of ties.
-            local.DisplayOrder.Value = long.MaxValue;
-
             foreach (var s in Scores)
             {
                 var score = Add(s.User, false);
@@ -68,6 +59,15 @@ namespace osu.Game.Screens.Play.HUD
                 score.Combo.Value = s.MaxCombo;
                 score.DisplayOrder.Value = s.OnlineID > 0 ? s.OnlineID : s.Date.ToUnixTimeSeconds();
             }
+
+            ILeaderboardScore local = Add(trackingUser, true);
+
+            local.TotalScore.BindTarget = scoreProcessor.TotalScore;
+            local.Accuracy.BindTarget = scoreProcessor.Accuracy;
+            local.Combo.BindTarget = scoreProcessor.Combo;
+
+            // Local score should always show lower than any existing scores in cases of ties.
+            local.DisplayOrder.Value = long.MaxValue;
         }
     }
 }

From 4385001d282c83eadb462d74fcab789af9d68538 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 13:59:11 +0900
Subject: [PATCH 473/709] Fix solo leaderboard seeing imported score via realm
 subscription flow

---
 osu.Game/Screens/Play/SoloPlayer.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index a36697c96e..d7730737d6 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Extensions;
@@ -52,6 +53,16 @@ namespace osu.Game.Screens.Play
 
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
 
+        protected override Task ImportScore(Score score)
+        {
+            // Before importing a score, stop binding the leaderboard with its score source.
+            // This avoids a case where the imported score may cause a leaderboard refresh
+            // (if the leaderboard's source is local).
+            LeaderboardScores.UnbindBindings();
+
+            return base.ImportScore(score);
+        }
+
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
         {
             IBeatmapInfo beatmap = score.ScoreInfo.BeatmapInfo;

From 5cc2721e9afaaf5476df4024cbd9b1e069449062 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 14:42:02 +0900
Subject: [PATCH 474/709] Add failing test showing layout failure in gameplay
 leaderboard

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 74 +++++++++++++++----
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 663e398c01..72656c29b1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,7 +6,9 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
@@ -18,37 +20,52 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneGameplayLeaderboard : OsuTestScene
     {
-        private readonly TestGameplayLeaderboard leaderboard;
+        private TestGameplayLeaderboard leaderboard;
 
         private readonly BindableDouble playerScore = new BindableDouble();
 
         public TestSceneGameplayLeaderboard()
         {
-            Add(leaderboard = new TestGameplayLeaderboard
+            AddStep("toggle expanded", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(2),
+                if (leaderboard != null)
+                    leaderboard.Expanded.Value = !leaderboard.Expanded.Value;
             });
+
+            AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
-        [SetUpSteps]
-        public void SetUpSteps()
+        [Test]
+        public void TestLayoutWithManyScores()
         {
-            AddStep("reset leaderboard", () =>
+            createLeaderboard();
+
+            AddStep("add many scores in one go", () =>
             {
-                leaderboard.Clear();
-                playerScore.Value = 1222333;
+                for (int i = 0; i < 32; i++)
+                    createRandomScore(new APIUser { Username = $"Player {i + 1}" });
+
+                // Add player at end to force an animation down the whole list.
+                playerScore.Value = 0;
+                createLeaderboardScore(playerScore, new APIUser { Username = "You", Id = 3 }, true);
             });
 
-            AddStep("add local player", () => createLeaderboardScore(playerScore, new APIUser { Username = "You", Id = 3 }, true));
-            AddStep("toggle expanded", () => leaderboard.Expanded.Value = !leaderboard.Expanded.Value);
-            AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
+            // Gameplay leaderboard has custom scroll logic, which when coupled with LayoutDuration
+            // has caused layout to not work in the past.
+
+            AddUntilStep("wait for fill flow layout",
+                () => leaderboard.ChildrenOfType<FillFlowContainer<GameplayLeaderboardScore>>().First().ScreenSpaceDrawQuad.Intersects(leaderboard.ScreenSpaceDrawQuad));
+
+            AddUntilStep("wait for some scores not masked away",
+                () => leaderboard.ChildrenOfType<GameplayLeaderboardScore>().Any(s => leaderboard.ScreenSpaceDrawQuad.Contains(s.ScreenSpaceDrawQuad.Centre)));
         }
 
         [Test]
         public void TestPlayerScore()
         {
+            createLeaderboard();
+            addLocalPlayer();
+
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
@@ -73,6 +90,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestRandomScores()
         {
+            createLeaderboard();
+            addLocalPlayer();
+
             int playerNumber = 1;
             AddRepeatStep("add player with random score", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 10);
         }
@@ -80,6 +100,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestExistingUsers()
         {
+            createLeaderboard();
+            addLocalPlayer();
+
             AddStep("add peppy", () => createRandomScore(new APIUser { Username = "peppy", Id = 2 }));
             AddStep("add smoogipoo", () => createRandomScore(new APIUser { Username = "smoogipoo", Id = 1040328 }));
             AddStep("add flyte", () => createRandomScore(new APIUser { Username = "flyte", Id = 3103765 }));
@@ -89,6 +112,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestMaxHeight()
         {
+            createLeaderboard();
+            addLocalPlayer();
+
             int playerNumber = 1;
             AddRepeatStep("add 3 other players", () => createRandomScore(new APIUser { Username = $"Player {playerNumber++}" }), 3);
             checkHeight(4);
@@ -103,6 +129,28 @@ namespace osu.Game.Tests.Visual.Gameplay
                 => AddAssert($"leaderboard height is {panelCount} panels high", () => leaderboard.DrawHeight == (GameplayLeaderboardScore.PANEL_HEIGHT + leaderboard.Spacing) * panelCount);
         }
 
+        private void addLocalPlayer()
+        {
+            AddStep("add local player", () =>
+            {
+                playerScore.Value = 1222333;
+                createLeaderboardScore(playerScore, new APIUser { Username = "You", Id = 3 }, true);
+            });
+        }
+
+        private void createLeaderboard()
+        {
+            AddStep("create leaderboard", () =>
+            {
+                Child = leaderboard = new TestGameplayLeaderboard
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(2),
+                };
+            });
+        }
+
         private void createRandomScore(APIUser user) => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), user);
 
         private void createLeaderboardScore(BindableDouble score, APIUser user, bool isTracked = false)

From 087ca59ebb0362a19202704cd4e94141839d476d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 14:48:53 +0900
Subject: [PATCH 475/709] Add extra margin space to flow equal to height of
 leaderboard

This ensures the content is always on screen, but also accounts for the
fact that scroll operations without animation were actually forcing the
local score to a location it can't usually reside at.

Basically, the local score was in the scroll extension region (due to always trying
to scroll the local player to the middle of the display, but there being
no other content below the local player to scroll up by).
---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index f21ce5e36a..62c8788396 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -96,6 +96,7 @@ namespace osu.Game.Screens.Play.HUD
 
             int displayCount = Math.Min(Flow.Count, maxPanels);
             Height = displayCount * (GameplayLeaderboardScore.PANEL_HEIGHT + Flow.Spacing.Y);
+            Flow.Margin = new MarginPadding { Bottom = Height };
             requiresScroll = displayCount != Flow.Count;
 
             return drawable;

From b04871f40a0060ac0474f5fc5cbcd416d5127ed2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 14:50:23 +0900
Subject: [PATCH 476/709] Animate scroll for a better visual experience

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 62c8788396..c4d81e7e2a 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Play.HUD
             if (requiresScroll && trackedScore != null)
             {
                 float scrollTarget = scroll.GetChildPosInContent(trackedScore) + trackedScore.DrawHeight / 2 - scroll.DrawHeight / 2;
-                scroll.ScrollTo(scrollTarget, false);
+                scroll.ScrollTo(scrollTarget);
             }
 
             const float panel_height = GameplayLeaderboardScore.PANEL_HEIGHT;

From 09960512716ebb755c2ed6d91cd8e9637203a3b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 15:03:06 +0900
Subject: [PATCH 477/709] Order test scores more correctly

---
 .../Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 2b8eb3a80c..ac73e88468 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new ScoreInfo { User = new APIUser { Username = @"spaceman_atlas" }, TotalScore = RNG.Next(500000, 1000000) },
                 new ScoreInfo { User = new APIUser { Username = @"frenzibyte" }, TotalScore = RNG.Next(500000, 1000000) },
                 new ScoreInfo { User = new APIUser { Username = @"Susko3" }, TotalScore = RNG.Next(500000, 1000000) },
-            }.Concat(Enumerable.Range(0, 50).Select(i => new ScoreInfo { User = new APIUser { Username = $"User {i + 1}" }, TotalScore = 500000 + i * 10000 })).ToList();
+            }.Concat(Enumerable.Range(0, 50).Select(i => new ScoreInfo { User = new APIUser { Username = $"User {i + 1}" }, TotalScore = 1000000 - i * 10000 })).ToList();
         }
     }
 }

From 5b73f24864058b3c6ac85e12a9fec5d87ece2e0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 15:21:32 +0900
Subject: [PATCH 478/709] Fix outdated scores being held by
 `BeatmapLeaderboard` after external beatmap switch

---
 osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 798cf29715..0f6ac2b455 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -41,6 +41,11 @@ namespace osu.Game.Screens.Select.Leaderboards
                     return;
 
                 beatmapInfo = value;
+
+                // Refetch is scheduled, which can cause scores to be outdated if the leaderboard is not currently updating.
+                // As scores are potentially used by other components, clear them eagerly to ensure a more correct state.
+                SetScores(null);
+
                 RefetchScores();
             }
         }

From 992441b9de388e8b463862ec8960ded13085a385 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 16:04:32 +0900
Subject: [PATCH 479/709] Disable alpha component parsing in beatmap / skin
 colour sections

---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs | 2 +-
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs               | 2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs                  | 6 +++---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs                 | 2 +-
 osu.Game/Skinning/LegacySkinDecoder.cs                      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 9fc1eb7650..fdd0167ed3 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -306,7 +306,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                     new Color4(128, 255, 128, 255),
                     new Color4(255, 187, 255, 255),
                     new Color4(255, 177, 140, 255),
-                    new Color4(100, 100, 100, 100),
+                    new Color4(100, 100, 100, 255), // alpha is specified as 100, but should be ignored.
                 };
                 Assert.AreEqual(expectedColors.Length, comboColors.Count);
                 for (int i = 0; i < expectedColors.Length; i++)
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index 419eb87b1a..6756f27ecd 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Skins
                     new Color4(142, 199, 255, 255),
                     new Color4(255, 128, 128, 255),
                     new Color4(128, 255, 255, 255),
-                    new Color4(100, 100, 100, 100),
+                    new Color4(100, 100, 100, 255), // alpha is specified as 100, but should be ignored.
                 };
 
                 Assert.AreEqual(expectedColors.Count, comboColors.Count);
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 3d65ab8e0f..9c066ada08 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Beatmaps.Formats
             switch (section)
             {
                 case Section.Colours:
-                    HandleColours(output, line);
+                    HandleColours(output, line, false);
                     return;
             }
         }
@@ -93,7 +93,7 @@ namespace osu.Game.Beatmaps.Formats
             return line;
         }
 
-        protected void HandleColours<TModel>(TModel output, string line)
+        protected void HandleColours<TModel>(TModel output, string line, bool allowAlpha)
         {
             var pair = SplitKeyVal(line);
 
@@ -108,7 +108,7 @@ namespace osu.Game.Beatmaps.Formats
 
             try
             {
-                byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
+                byte alpha = allowAlpha && split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
                 colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 49914c53aa..0aafdd4db0 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Skinning
                         break;
 
                     case string when pair.Key.StartsWith("Colour", StringComparison.Ordinal):
-                        HandleColours(currentConfig, line);
+                        HandleColours(currentConfig, line, true);
                         break;
 
                     // Custom sprite paths
diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index e5f87b3230..11c21d432f 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Skinning
                     // osu!catch section only has colour settings
                     // so no harm in handling the entire section
                     case Section.CatchTheBeat:
-                        HandleColours(skin, line);
+                        HandleColours(skin, line, true);
                         return;
                 }
 

From 2b8b138079aefad5586c70cf5cf84f1ab9f1dfe2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 21 Sep 2022 18:44:01 +0900
Subject: [PATCH 480/709] Add "keybindings" search term to settings

---
 osu.Game/Overlays/Settings/Sections/InputSection.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 4d75537f6b..a8fe3d04be 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -20,6 +22,8 @@ namespace osu.Game.Overlays.Settings.Sections
 
         public override LocalisableString Header => InputSettingsStrings.InputSectionHeader;
 
+        public override IEnumerable<LocalisableString> FilterTerms => base.FilterTerms.Concat(new LocalisableString[] { "keybindings" });
+
         public override Drawable CreateIcon() => new SpriteIcon
         {
             Icon = FontAwesome.Solid.Keyboard

From 1ef09f2ae1e3cfb9c0c7080af6fc4b003300da67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 23:26:25 +0900
Subject: [PATCH 481/709] Fix regression in `TestSceneSongProgress`

---
 .../Visual/Gameplay/TestSceneSongProgress.cs      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 3487f4dbff..6127aa304c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -1,8 +1,8 @@
 // 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.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -51,13 +51,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleSeeking()
         {
-            DefaultSongProgress getDefaultProgress() => this.ChildrenOfType<DefaultSongProgress>().Single();
+            void applyToDefaultProgress(Action<DefaultSongProgress> action) =>
+                this.ChildrenOfType<DefaultSongProgress>().ForEach(action);
 
-            AddStep("allow seeking", () => getDefaultProgress().AllowSeeking.Value = true);
-            AddStep("hide graph", () => getDefaultProgress().ShowGraph.Value = false);
-            AddStep("disallow seeking", () => getDefaultProgress().AllowSeeking.Value = false);
-            AddStep("allow seeking", () => getDefaultProgress().AllowSeeking.Value = true);
-            AddStep("show graph", () => getDefaultProgress().ShowGraph.Value = true);
+            AddStep("allow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = true));
+            AddStep("hide graph", () => applyToDefaultProgress(s => s.ShowGraph.Value = false));
+            AddStep("disallow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = false));
+            AddStep("allow seeking", () => applyToDefaultProgress(s => s.AllowSeeking.Value = true));
+            AddStep("show graph", () => applyToDefaultProgress(s => s.ShowGraph.Value = true));
         }
 
         private void setHitObjects()

From 86a09ad2cfee383ef397aeacbcdb2152c40e4f12 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Wed, 21 Sep 2022 17:14:02 +0200
Subject: [PATCH 482/709] Rename ClampToPlayField

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index a0b6c7e724..015457e84f 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = ClampToPlayField(EffectiveX + Path.PositionAt(
+                                X = ClampToPlayfield(EffectiveX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X),
                             });
                         }
@@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = ClampToPlayField(EffectiveX + Path.PositionAt(e.PathProgress).X),
+                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
 
@@ -114,16 +114,16 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = ClampToPlayField(EffectiveX + Path.PositionAt(e.PathProgress).X),
+                            X = ClampToPlayfield(EffectiveX + Path.PositionAt(e.PathProgress).X),
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => ClampToPlayField(EffectiveX + this.CurvePositionAt(1).X);
+        public float EndX => ClampToPlayfield(EffectiveX + this.CurvePositionAt(1).X);
 
-        public float ClampToPlayField(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
+        public float ClampToPlayfield(float value) => Math.Clamp(value, 0, CatchPlayfield.WIDTH);
 
         [JsonIgnore]
         public double Duration

From 5d543545884a3543644f816cce00b08ab055850d Mon Sep 17 00:00:00 2001
From: B3nn1 <benjamin@koch-1.de>
Date: Wed, 21 Sep 2022 18:53:25 +0200
Subject: [PATCH 483/709] Add missing ToScreenSpace() call

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 5673dab7e8..7c289b5b05 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             if (placementControlPoint != null)
             {
                 var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
-                placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? e.MousePosition) - HitObject.Position;
+                placementControlPoint.Position = ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - HitObject.Position;
             }
         }
 

From 112bbe2296b3ea9e068e14a8cdaee03031ee2c40 Mon Sep 17 00:00:00 2001
From: B3nn1 <benjamin@koch-1.de>
Date: Wed, 21 Sep 2022 18:56:22 +0200
Subject: [PATCH 484/709] Always use Parent.ToScreenSpace() in
 PathControlPointVisualiser

---
 .../Sliders/Components/PathControlPointVisualiser.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 628329ba64..94655f3cf7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -303,9 +303,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
             {
-                var result = snapProvider?.FindSnappedPositionAndTime(ToScreenSpace(e.MousePosition));
+                var result = snapProvider?.FindSnappedPositionAndTime(Parent.ToScreenSpace(e.MousePosition));
 
-                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - slider.Position;
+                Vector2 movementDelta = Parent.ToLocalSpace(result?.ScreenSpacePosition ?? Parent.ToScreenSpace(e.MousePosition)) - dragStartPositions[draggedControlPointIndex] - slider.Position;
 
                 for (int i = 0; i < controlPoints.Count; ++i)
                 {

From db21601632d36e48399b95439f571ee75e1fb115 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 12:52:24 +0900
Subject: [PATCH 485/709] Add warning message in `files` folder to avoid
 accidental deletion

This is a pretty standard practice for applications that have data
stored in folders where a user may accidentally determine that the
content is unnecessary.

Aims to address cases like
https://github.com/ppy/osu/discussions/20394#discussioncomment-3705694.
It's not the first time this has come up, and definitely won't be the
last.
---
 osu.Game/OsuGameBase.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8b016e8eb0..2d32fe398a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -255,6 +256,8 @@ namespace osu.Game
 
             InitialiseFonts();
 
+            addFilesWarning();
+
             Audio.Samples.PlaybackConcurrency = SAMPLE_CONCURRENCY;
 
             dependencies.Cache(SkinManager = new SkinManager(Storage, realm, Host, Resources, Audio, Scheduler));
@@ -373,6 +376,29 @@ namespace osu.Game
             Beatmap.BindValueChanged(onBeatmapChanged);
         }
 
+        private void addFilesWarning()
+        {
+            var realmStore = new RealmFileStore(realm, Storage);
+
+            const string filename = "IMPORTANT READ ME.txt";
+
+            if (!realmStore.Storage.Exists(filename))
+            {
+                using (var stream = realmStore.Storage.CreateFileSafely(filename))
+                using (var textWriter = new StreamWriter(stream))
+                {
+                    textWriter.WriteLine(@"This folder contains all your user files (beatmaps, skins, replays etc.)");
+                    textWriter.WriteLine(@"Please do not touch or delete this folder!!");
+                    textWriter.WriteLine();
+                    textWriter.WriteLine(@"If you are really looking to completely delete user data, please delete");
+                    textWriter.WriteLine(@"the parent folder including all other files and directories");
+                    textWriter.WriteLine();
+                    textWriter.WriteLine(@"For more information on how these files are organised,");
+                    textWriter.WriteLine(@"see https://github.com/ppy/osu/wiki/User-file-storage");
+                }
+            }
+        }
+
         private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction)
         {
             // FramedBeatmapClock uses a decoupled clock internally which will mutate the source if it is an `IAdjustableClock`.

From 2bdc6417e9f23105d6df4c3e4c49c445added1c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Sep 2022 23:38:02 +0900
Subject: [PATCH 486/709] Mark `DrawableOsuHitObject` `abstract` for clarity

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 6e525071ca..c0acae378c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
+    public abstract class DrawableOsuHitObject : DrawableHitObject<OsuHitObject>
     {
         public readonly IBindable<Vector2> PositionBindable = new Bindable<Vector2>();
         public readonly IBindable<int> StackHeightBindable = new Bindable<int>();

From 78625fda7d82de8a62bd3000b4db29e4b3f3fa49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 14:42:19 +0900
Subject: [PATCH 487/709] Improve exception when attempting to call
 `DrawableHitObject.ClearInternal`

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 39ccaa2e5d..e218da918c 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             config.BindWith(OsuSetting.PositionalHitsoundsLevel, positionalHitsoundsLevel);
 
-            // Explicit non-virtual function call.
+            // Explicit non-virtual function call in case a DrawableHitObject overrides AddInternal.
             base.AddInternal(Samples = new PausableSkinnableSound());
 
             CurrentSkin = skinSource;
@@ -405,7 +405,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState;
 
-        protected override void ClearInternal(bool disposeChildren = true) => throw new InvalidOperationException($"Should never clear a {nameof(DrawableHitObject)}");
+        protected override void ClearInternal(bool disposeChildren = true) =>
+            // See sample addition in load method.
+            throw new InvalidOperationException(
+                $"Should never clear a {nameof(DrawableHitObject)} as the base implementation adds components. If attempting to use {nameof(InternalChild)} or {nameof(InternalChildren)}, using {nameof(AddInternal)} or {nameof(AddRangeInternal)} instead.");
 
         private void updateState(ArmedState newState, bool force = false)
         {

From b844d76311e535f908e312be03f6f2c9fc314f2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 14:30:01 +0900
Subject: [PATCH 488/709] Move `Shake` logic local to hitcircle/slider

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   |  2 +-
 .../Objects/Drawables/DrawableHitCircle.cs    | 35 +++++++++++++------
 .../Objects/Drawables/DrawableOsuHitObject.cs | 22 +++---------
 .../Objects/Drawables/DrawableSlider.cs       | 22 +++++++++---
 .../Objects/Drawables/DrawableSliderHead.cs   |  9 ++---
 5 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 9d06ff5801..e5b7208da6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             if (!objects.Any())
                 return false;
 
-            return objects.All(o => Precision.AlmostEquals(o.ChildrenOfType<ShakeContainer>().First().Children.OfType<Container>().Single().Scale.X, target));
+            return objects.All(o => Precision.AlmostEquals(o.ChildrenOfType<Container>().First().Scale.X, target));
         }
 
         private bool checkSomeHit()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 23e5cb0ad7..09a460569a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
@@ -47,6 +48,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
+        private ShakeContainer shakeContainer;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -72,18 +75,26 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                                 return true;
                             },
                         },
-                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece())
+                        shakeContainer = new ShakeContainer
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        },
-                        ApproachCircle = new ProxyableSkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.ApproachCircle), _ => new DefaultApproachCircle())
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            ShakeDuration = 30,
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            Scale = new Vector2(4),
+                            Children = new Drawable[]
+                            {
+                                CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece())
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                },
+                                ApproachCircle = new ProxyableSkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.ApproachCircle), _ => new DefaultApproachCircle())
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    Scale = new Vector2(4),
+                                }
+                            }
                         }
                     }
                 },
@@ -123,6 +134,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        public override void Shake() => shakeContainer.Shake();
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
@@ -139,7 +152,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
             {
-                Shake(Math.Abs(timeOffset) - HitObject.HitWindows.WindowFor(HitResult.Miss));
+                Shake();
                 return;
             }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index c0acae378c..6f4ca30bd0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -6,12 +6,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Graphics.Containers;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -34,8 +33,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public Func<DrawableHitObject, double, bool> CheckHittable;
 
-        private ShakeContainer shakeContainer;
-
         protected DrawableOsuHitObject(OsuHitObject hitObject)
             : base(hitObject)
         {
@@ -45,12 +42,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void load()
         {
             Alpha = 0;
-
-            base.AddInternal(shakeContainer = new ShakeContainer
-            {
-                ShakeDuration = 30,
-                RelativeSizeAxes = Axes.Both
-            });
         }
 
         protected override void OnApply()
@@ -73,18 +64,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
         }
 
-        // Forward all internal management to shakeContainer.
-        // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
-        protected override void AddInternal(Drawable drawable) => shakeContainer.Add(drawable);
-        protected override void ClearInternal(bool disposeChildren = true) => shakeContainer.Clear(disposeChildren);
-        protected override bool RemoveInternal(Drawable drawable, bool disposeImmediately) => shakeContainer.Remove(drawable, disposeImmediately);
-
         protected sealed override double InitialLifetimeOffset => HitObject.TimePreempt;
 
         private OsuInputManager osuActionInputManager;
         internal OsuInputManager OsuActionInputManager => osuActionInputManager ??= GetContainingInputManager() as OsuInputManager;
 
-        public virtual void Shake(double maximumLength) => shakeContainer.Shake(maximumLength);
+        /// <summary>
+        /// Shake the hit object in case it was clicked far too early or late (aka "note lock").
+        /// </summary>
+        public virtual void Shake() { }
 
         /// <summary>
         /// Causes this <see cref="DrawableOsuHitObject"/> to get missed, disregarding all conditions in implementations of <see cref="DrawableHitObject.CheckForResult"/>.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index d83f5df7a3..3393d26e01 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Skinning;
@@ -34,6 +35,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public SkinnableDrawable Body { get; private set; }
 
+        private ShakeContainer shakeContainer;
+
         /// <summary>
         /// A target container which can be used to add top level elements to the slider's display.
         /// Intended to be used for proxy purposes only.
@@ -76,10 +79,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             InternalChildren = new Drawable[]
             {
-                Body = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
-                tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
-                tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
-                repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
+                shakeContainer = new ShakeContainer
+                {
+                    ShakeDuration = 30,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        Body = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderBody), _ => new DefaultSliderBody(), confineMode: ConfineMode.NoScaling),
+                        tailContainer = new Container<DrawableSliderTail> { RelativeSizeAxes = Axes.Both },
+                        tickContainer = new Container<DrawableSliderTick> { RelativeSizeAxes = Axes.Both },
+                        repeatContainer = new Container<DrawableSliderRepeat> { RelativeSizeAxes = Axes.Both },
+                    }
+                },
+                // slider head is not included in shake as it handles hit detection, and handles its own shaking.
                 headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
                 OverlayElementContainer = new Container { RelativeSizeAxes = Axes.Both, },
                 Ball,
@@ -109,6 +121,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             PathVersion.BindTo(HitObject.Path.Version);
         }
 
+        public override void Shake() => shakeContainer.Shake();
+
         protected override void OnFree()
         {
             base.OnFree();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 70b1bd225f..80b9544e5b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             pathVersion.BindTo(DrawableSlider.PathVersion);
 
-            OnShake = DrawableSlider.Shake;
             CheckHittable = (d, t) => DrawableSlider.CheckHittable?.Invoke(d, t) ?? true;
         }
 
@@ -96,9 +95,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
         }
 
-        public Action<double> OnShake;
-
-        public override void Shake(double maximumLength) => OnShake?.Invoke(maximumLength);
+        public override void Shake()
+        {
+            base.Shake();
+            DrawableSlider.Shake();
+        }
 
         private void updatePosition()
         {

From 749053481a2d0fa210754f9d53840a6852b5ad99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 14:46:37 +0900
Subject: [PATCH 489/709] Update osu! hitobject implementation to avoid
 triggering `ClearInternal`

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs  | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 4 ++--
 .../Objects/Drawables/DrawableSliderRepeat.cs                 | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 09a460569a..c5992b359d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             Origin = Anchor.Centre;
 
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 scaleContainer = new Container
                 {
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         }
                     }
                 },
-            };
+            });
 
             Size = HitArea.DrawSize;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 3393d26e01..d58a435728 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 shakeContainer = new ShakeContainer
                 {
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 OverlayElementContainer = new Container { RelativeSizeAxes = Axes.Both, },
                 Ball,
                 slidingSample = new PausableSkinnableSound { Looping = true }
-            };
+            });
 
             PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
             StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 1bddc603ac..7b9c0c7e40 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
-            InternalChild = scaleContainer = new Container
+            AddInternal(scaleContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     },
                     Arrow = new ReverseArrowPiece(),
                 }
-            };
+            });
 
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index df3a12fe33..063d297f5a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 scaleContainer = new Container
                 {
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
                     }
                 },
-            };
+            });
 
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 3ffbe68b98..4bd98fc8b2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
             Origin = Anchor.Centre;
 
-            InternalChild = scaleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderScorePoint), _ => new CircularContainer
+            AddInternal(scaleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderScorePoint), _ => new CircularContainer
             {
                 Masking = true,
                 Origin = Anchor.Centre,
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-            };
+            });
 
             ScaleBindable.BindValueChanged(scale => scaleContainer.Scale = new Vector2(scale.NewValue));
         }

From e48fe3a9e23d5f40f7703812244727406e09db67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:17:37 +0900
Subject: [PATCH 490/709] Add nullability to test scene

---
 .../Gameplay/TestSceneColourHitErrorMeter.cs    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index 5fdd00a7f6..edb95ecf70 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -1,11 +1,11 @@
 // 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.
 
-#nullable disable
 using System;
 using System.Diagnostics;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
@@ -21,22 +21,27 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneColourHitErrorMeter : OsuTestScene
     {
-        private DependencyProvidingContainer dependencyContainer;
+        private DependencyProvidingContainer dependencyContainer = null!;
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
-        private ScoreProcessor scoreProcessor;
+        private ScoreProcessor scoreProcessor = null!;
+
         private int iteration;
-        private ColourHitErrorMeter colourHitErrorMeter;
+
+        private ColourHitErrorMeter colourHitErrorMeter = null!;
 
         public TestSceneColourHitErrorMeter()
         {
             AddSliderStep("Manual Opacity test", 0.01f, 1, 1, alpha =>
             {
-                if (colourHitErrorMeter != null) colourHitErrorMeter.HitShapeOpacity.Value = alpha;
+                if (colourHitErrorMeter.IsNotNull())
+                    colourHitErrorMeter.HitShapeOpacity.Value = alpha;
             });
+
             AddSliderStep("Manual spacing test", 0, 10, 2, spacing =>
             {
-                if (colourHitErrorMeter != null) colourHitErrorMeter.HitShapeSpacing.Value = spacing;
+                if (colourHitErrorMeter.IsNotNull())
+                    colourHitErrorMeter.HitShapeSpacing.Value = spacing;
             });
         }
 

From f3898da37ade7ba9ee848499034eecd13e31817e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:18:20 +0900
Subject: [PATCH 491/709] Rename judgement count to not mention "shape"

---
 .../Visual/Gameplay/TestSceneColourHitErrorMeter.cs    |  2 +-
 .../Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index edb95ecf70..23c7410231 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestJudgementAmountChange()
         {
             AddRepeatStep("Add judgement", applyOneJudgement, 10);
-            AddStep("Judgement count change to 4", () => colourHitErrorMeter.HitShapeCount.Value = 4);
+            AddStep("Judgement count change to 4", () => colourHitErrorMeter.JudgementCount.Value = 4);
             AddRepeatStep("Add judgement", applyOneJudgement, 8);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 8991d97bd4..08df9833d0 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private const int drawable_judgement_size = 8;
 
         [SettingSource("Judgement count", "Number of displayed judgements")]
-        public BindableNumber<int> HitShapeCount { get; } = new BindableNumber<int>(20)
+        public BindableNumber<int> JudgementCount { get; } = new BindableNumber<int>(20)
         {
             MinValue = 1,
             MaxValue = 30,
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (!judgement.Type.IsScorable() || judgement.Type.IsBonus())
                 return;
 
-            judgementsFlow.Push(GetColourForHitResult(judgement.Type), HitShapeCount.Value);
+            judgementsFlow.Push(GetColourForHitResult(judgement.Type), JudgementCount.Value);
         }
 
         protected override void LoadComplete()
@@ -69,14 +69,14 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             HitShapeOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitShapeOpacity.Value, true);
             HitShapeSpacing.BindValueChanged(_ =>
             {
-                judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
+                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
                 judgementsFlow.Spacing = new Vector2(0, HitShapeSpacing.Value);
             }, true);
-            HitShapeCount.BindValueChanged(_ =>
+            JudgementCount.BindValueChanged(_ =>
             {
                 //Used to clear out the overflowing judgement children when the value is lowered
                 judgementsFlow.RemoveAll(_ => true, true);
-                judgementsFlow.Height = HitShapeCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
+                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
             }, true);
             HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true);
         }

From 19db7c5977dec67acc528047b80f0e9920f0cb9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:19:00 +0900
Subject: [PATCH 492/709] Remove "Opacity" setting

This should be implemented at a higher level
---
 .../Gameplay/TestSceneColourHitErrorMeter.cs       | 14 --------------
 .../Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs |  9 ---------
 2 files changed, 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index 23c7410231..84be2c8eb9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -32,12 +32,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public TestSceneColourHitErrorMeter()
         {
-            AddSliderStep("Manual Opacity test", 0.01f, 1, 1, alpha =>
-            {
-                if (colourHitErrorMeter.IsNotNull())
-                    colourHitErrorMeter.HitShapeOpacity.Value = alpha;
-            });
-
             AddSliderStep("Manual spacing test", 0, 10, 2, spacing =>
             {
                 if (colourHitErrorMeter.IsNotNull())
@@ -75,14 +69,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();
 
-        [Test]
-        public void TestOpacityChange()
-        {
-            AddRepeatStep("Add judgement", applyOneJudgement, 5);
-            AddStep("Change opacity to 30%", () => colourHitErrorMeter.HitShapeOpacity.Value = 0.3f);
-            AddRepeatStep("Add judgement", applyOneJudgement, 5);
-        }
-
         [Test]
         public void TestSpacingChange()
         {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 08df9833d0..bed815b98e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -28,14 +28,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             Precision = 1
         };
 
-        [SettingSource("Opacity", "Visibility of the displayed judgements")]
-        public BindableNumber<float> HitShapeOpacity { get; } = new BindableNumber<float>(1)
-        {
-            MinValue = 0.01f,
-            MaxValue = 1,
-            Precision = 0.01f,
-        };
-
         [SettingSource("Spacing", "Space between each displayed judgement")]
         public BindableNumber<float> HitShapeSpacing { get; } = new BindableNumber<float>(2)
         {
@@ -66,7 +58,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            HitShapeOpacity.BindValueChanged(_ => judgementsFlow.Alpha = HitShapeOpacity.Value, true);
             HitShapeSpacing.BindValueChanged(_ =>
             {
                 judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;

From ae70b2c32fcf5805aafae8da1d81290b0e1bd7e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:21:27 +0900
Subject: [PATCH 493/709] Fix other weirdness in variable and description
 naming

---
 .../Gameplay/TestSceneColourHitErrorMeter.cs  |  6 ++---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 26 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index 84be2c8eb9..fccbf092fc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("Manual spacing test", 0, 10, 2, spacing =>
             {
                 if (colourHitErrorMeter.IsNotNull())
-                    colourHitErrorMeter.HitShapeSpacing.Value = spacing;
+                    colourHitErrorMeter.JudgementSpacing.Value = spacing;
             });
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestSpacingChange()
         {
             AddRepeatStep("Add judgement", applyOneJudgement, 5);
-            AddStep("Change spacing", () => colourHitErrorMeter.HitShapeSpacing.Value = 10);
+            AddStep("Change spacing", () => colourHitErrorMeter.JudgementSpacing.Value = 10);
             AddRepeatStep("Add judgement", applyOneJudgement, 5);
         }
 
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestHitErrorShapeChange()
         {
             AddRepeatStep("Add judgement", applyOneJudgement, 8);
-            AddStep("Change shape square", () => colourHitErrorMeter.HitShape.Value = ColourHitErrorMeter.ShapeStyle.Square);
+            AddStep("Change shape square", () => colourHitErrorMeter.JudgementShape.Value = ColourHitErrorMeter.ShapeStyle.Square);
             AddRepeatStep("Add judgement", applyOneJudgement, 10);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index bed815b98e..48b6676020 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private const int animation_duration = 200;
         private const int drawable_judgement_size = 8;
 
-        [SettingSource("Judgement count", "Number of displayed judgements")]
+        [SettingSource("Judgement count", "The number of displayed judgements")]
         public BindableNumber<int> JudgementCount { get; } = new BindableNumber<int>(20)
         {
             MinValue = 1,
@@ -28,23 +28,26 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             Precision = 1
         };
 
-        [SettingSource("Spacing", "Space between each displayed judgement")]
-        public BindableNumber<float> HitShapeSpacing { get; } = new BindableNumber<float>(2)
+        [SettingSource("Judgement spacing", "The space between each displayed judgement")]
+        public BindableNumber<float> JudgementSpacing { get; } = new BindableNumber<float>(2)
         {
             MinValue = 0,
             MaxValue = 10,
             Precision = 0.1f
         };
 
-        [SettingSource("Shape", "The shape of each displayed judgement")]
-        public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>();
+        [SettingSource("Judgement shape", "The shape of each displayed judgement")]
+        public Bindable<ShapeStyle> JudgementShape { get; } = new Bindable<ShapeStyle>();
 
         private readonly JudgementFlow judgementsFlow;
 
         public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
-            InternalChild = judgementsFlow = new JudgementFlow();
+            InternalChild = judgementsFlow = new JudgementFlow
+            {
+                Shape = { BindTarget = JudgementShape }
+            };
         }
 
         protected override void OnNewJudgement(JudgementResult judgement)
@@ -58,18 +61,19 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            HitShapeSpacing.BindValueChanged(_ =>
+
+            JudgementSpacing.BindValueChanged(_ =>
             {
-                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
-                judgementsFlow.Spacing = new Vector2(0, HitShapeSpacing.Value);
+                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + JudgementSpacing.Value) - JudgementSpacing.Value;
+                judgementsFlow.Spacing = new Vector2(0, JudgementSpacing.Value);
             }, true);
+
             JudgementCount.BindValueChanged(_ =>
             {
                 //Used to clear out the overflowing judgement children when the value is lowered
                 judgementsFlow.RemoveAll(_ => true, true);
-                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + HitShapeSpacing.Value) - HitShapeSpacing.Value;
+                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + JudgementSpacing.Value) - JudgementSpacing.Value;
             }, true);
-            HitShape.BindValueChanged(_ => judgementsFlow.Shape.Value = HitShape.Value, true);
         }
 
         public override void Clear() => judgementsFlow.Clear();

From 0f663deda068ec41c2f5a5ef49e35d80d4c262e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:24:57 +0900
Subject: [PATCH 494/709] Fix changing shape causing alpha to be permanently
 reset to zero

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 48b6676020..83830a73eb 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -112,6 +112,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             private readonly Color4 colour;
 
+            private Container content = null!;
+
             public HitErrorShape(Color4 colour, int size)
             {
                 this.colour = colour;
@@ -122,33 +124,29 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             {
                 base.LoadComplete();
 
+                Child = content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colour
+                };
+
                 Shape.BindValueChanged(shape =>
                 {
                     switch (shape.NewValue)
                     {
                         case ShapeStyle.Circle:
-                            Child = new Circle
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                Colour = colour
-                            };
+                            content.Child = new Circle { RelativeSizeAxes = Axes.Both };
                             break;
 
                         case ShapeStyle.Square:
-                            Child = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                Colour = colour
-                            };
+                            content.Child = new Box { RelativeSizeAxes = Axes.Both };
                             break;
                     }
                 }, true);
 
-                Child.FadeInFromZero(animation_duration, Easing.OutQuint);
-                Child.MoveToY(-DrawSize.Y);
-                Child.MoveToY(0, animation_duration, Easing.OutQuint);
+                content.FadeInFromZero(animation_duration, Easing.OutQuint);
+                content.MoveToY(-DrawSize.Y);
+                content.MoveToY(0, animation_duration, Easing.OutQuint);
             }
 
             public void Remove()

From 26d98323ff88b318de252e7e72539169f01f9d26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:45:23 +0900
Subject: [PATCH 495/709] Fix bindable flow, code quality, everything

---
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 83830a73eb..530743137d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -24,8 +24,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         public BindableNumber<int> JudgementCount { get; } = new BindableNumber<int>(20)
         {
             MinValue = 1,
-            MaxValue = 30,
-            Precision = 1
+            MaxValue = 50,
         };
 
         [SettingSource("Judgement spacing", "The space between each displayed judgement")]
@@ -46,7 +45,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             AutoSizeAxes = Axes.Both;
             InternalChild = judgementsFlow = new JudgementFlow
             {
-                Shape = { BindTarget = JudgementShape }
+                JudgementShape = { BindTarget = JudgementShape },
+                JudgementSpacing = { BindTarget = JudgementSpacing },
+                JudgementCount = { BindTarget = JudgementCount }
             };
         }
 
@@ -55,25 +56,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (!judgement.Type.IsScorable() || judgement.Type.IsBonus())
                 return;
 
-            judgementsFlow.Push(GetColourForHitResult(judgement.Type), JudgementCount.Value);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            JudgementSpacing.BindValueChanged(_ =>
-            {
-                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + JudgementSpacing.Value) - JudgementSpacing.Value;
-                judgementsFlow.Spacing = new Vector2(0, JudgementSpacing.Value);
-            }, true);
-
-            JudgementCount.BindValueChanged(_ =>
-            {
-                //Used to clear out the overflowing judgement children when the value is lowered
-                judgementsFlow.RemoveAll(_ => true, true);
-                judgementsFlow.Height = JudgementCount.Value * (drawable_judgement_size + JudgementSpacing.Value) - JudgementSpacing.Value;
-            }, true);
+            judgementsFlow.Push(GetColourForHitResult(judgement.Type));
         }
 
         public override void Clear() => judgementsFlow.Clear();
@@ -82,7 +65,11 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
-            public readonly Bindable<ShapeStyle> Shape = new Bindable<ShapeStyle>();
+            public readonly Bindable<ShapeStyle> JudgementShape = new Bindable<ShapeStyle>();
+
+            public readonly Bindable<float> JudgementSpacing = new Bindable<float>();
+
+            public readonly Bindable<int> JudgementCount = new Bindable<int>();
 
             public JudgementFlow()
             {
@@ -92,15 +79,41 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 LayoutEasing = Easing.OutQuint;
             }
 
-            public void Push(Color4 colour, int maxErrorShapeCount)
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                JudgementCount.BindValueChanged(count =>
+                {
+                    removeExtraJudgements();
+                    updateMetrics();
+                });
+
+                JudgementSpacing.BindValueChanged(_ => updateMetrics(), true);
+            }
+
+            public void Push(Color4 colour)
             {
                 Add(new HitErrorShape(colour, drawable_judgement_size)
                 {
-                    Shape = { BindTarget = Shape },
+                    Shape = { BindTarget = JudgementShape },
                 });
 
-                if (Children.Count > maxErrorShapeCount)
-                    Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
+                removeExtraJudgements();
+            }
+
+            private void removeExtraJudgements()
+            {
+                var remainingChildren = Children.Where(c => !c.IsRemoved);
+
+                while (remainingChildren.Count() > JudgementCount.Value)
+                    remainingChildren.First().Remove();
+            }
+
+            private void updateMetrics()
+            {
+                Height = JudgementCount.Value * (drawable_judgement_size + JudgementSpacing.Value) - JudgementSpacing.Value;
+                Spacing = new Vector2(0, JudgementSpacing.Value);
             }
         }
 

From 1ed4b9c11c1ce300022e505ec91c9258fa16b9f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:45:30 +0900
Subject: [PATCH 496/709] Add more flexibility to test

---
 .../Visual/Gameplay/TestSceneColourHitErrorMeter.cs      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
index fccbf092fc..a953db4f19 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneColourHitErrorMeter.cs
@@ -32,11 +32,17 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public TestSceneColourHitErrorMeter()
         {
-            AddSliderStep("Manual spacing test", 0, 10, 2, spacing =>
+            AddSliderStep("Judgement spacing", 0, 10, 2, spacing =>
             {
                 if (colourHitErrorMeter.IsNotNull())
                     colourHitErrorMeter.JudgementSpacing.Value = spacing;
             });
+
+            AddSliderStep("Judgement count", 1, 50, 5, spacing =>
+            {
+                if (colourHitErrorMeter.IsNotNull())
+                    colourHitErrorMeter.JudgementCount.Value = spacing;
+            });
         }
 
         [SetUpSteps]
@@ -91,6 +97,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep("Add judgement", applyOneJudgement, 8);
             AddStep("Change shape square", () => colourHitErrorMeter.JudgementShape.Value = ColourHitErrorMeter.ShapeStyle.Square);
             AddRepeatStep("Add judgement", applyOneJudgement, 10);
+            AddStep("Change shape circle", () => colourHitErrorMeter.JudgementShape.Value = ColourHitErrorMeter.ShapeStyle.Circle);
         }
 
         private void applyOneJudgement()

From f0dcda9accbf4e67060407ec3c49e4a758953069 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 15:49:02 +0900
Subject: [PATCH 497/709] Decrease precision of spacing setting

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 530743137d..dadec7c06b 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             MinValue = 0,
             MaxValue = 10,
-            Precision = 0.1f
         };
 
         [SettingSource("Judgement shape", "The shape of each displayed judgement")]

From 0458305a23f801928f85f1a587961732adb68d96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 17:40:19 +0900
Subject: [PATCH 498/709] Add argon judgement bubbles

---
 .../Skinning/Argon/ArgonJudgementPiece.cs     | 88 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
index 315b9ec65e..b08b7b4e85 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
@@ -1,14 +1,17 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
 
@@ -20,6 +23,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         protected SpriteText JudgementText { get; private set; } = null!;
 
+        private RingExplosion? ringExplosion;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -42,10 +47,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Origin = Anchor.Centre,
                     Text = Result.GetDescription().ToUpperInvariant(),
                     Colour = colours.ForHitResult(Result),
+                    Blending = BlendingParameters.Additive,
                     Spacing = new Vector2(5, 0),
                     Font = OsuFont.Default.With(size: 20, weight: FontWeight.Bold),
-                }
+                },
             };
+
+            if (Result.IsHit())
+            {
+                AddInternal(ringExplosion = new RingExplosion(Result)
+                {
+                    Colour = colours.ForHitResult(Result),
+                });
+            }
         }
 
         /// <summary>
@@ -78,8 +92,80 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             }
 
             this.FadeOutFromOne(800);
+
+            ringExplosion?.PlayAnimation();
         }
 
         public Drawable? GetAboveHitObjectsProxiedContent() => null;
+
+        private class RingExplosion : CompositeDrawable
+        {
+            private readonly float travel = 52;
+
+            public RingExplosion(HitResult result)
+            {
+                const float thickness = 4;
+
+                const float small_size = 9;
+                const float large_size = 14;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Blending = BlendingParameters.Additive;
+
+                int countSmall = 0;
+                int countLarge = 0;
+
+                switch (result)
+                {
+                    case HitResult.Meh:
+                        countSmall = 3;
+                        travel *= 0.3f;
+                        break;
+
+                    case HitResult.Ok:
+                    case HitResult.Good:
+                        countSmall = 4;
+                        travel *= 0.6f;
+                        break;
+
+                    case HitResult.Great:
+                    case HitResult.Perfect:
+                        countSmall = 4;
+                        countLarge = 4;
+                        break;
+                }
+
+                for (int i = 0; i < countSmall; i++)
+                    AddInternal(new RingPiece(thickness) { Size = new Vector2(small_size) });
+
+                for (int i = 0; i < countLarge; i++)
+                    AddInternal(new RingPiece(thickness) { Size = new Vector2(large_size) });
+            }
+
+            public void PlayAnimation()
+            {
+                foreach (var c in InternalChildren)
+                {
+                    const float start_position_ratio = 0.3f;
+
+                    float direction = RNG.NextSingle(0, 360);
+                    float distance = RNG.NextSingle(travel / 2, travel);
+
+                    c.MoveTo(new Vector2(
+                        MathF.Cos(direction) * distance * start_position_ratio,
+                        MathF.Sin(direction) * distance * start_position_ratio
+                    ));
+
+                    c.MoveTo(new Vector2(
+                        MathF.Cos(direction) * distance,
+                        MathF.Sin(direction) * distance
+                    ), 600, Easing.OutQuint);
+                }
+
+                this.FadeOutFromOne(1000, Easing.OutQuint);
+            }
+        }
     }
 }

From b321afc3a67da245eb23e7052b02e07defb5a433 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 18:00:02 +0900
Subject: [PATCH 499/709] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/OsuGame.cs      | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 77c29a5d6e..dd263d6aaa 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.922.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9a63ccbf48..7e6bd7c7be 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1041,7 +1041,7 @@ namespace osu.Game
 
             Logger.NewEntry += entry =>
             {
-                if (entry.Level < LogLevel.Important || !entry.LoggerName.Equals(ITabletHandler.LOGGER_NAME, StringComparison.OrdinalIgnoreCase))
+                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(@"[Tablet]", StringComparison.Ordinal))
                     return;
 
                 if (entry.Level == LogLevel.Error)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 29e690a024..c4e2a5168e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 83410b08f6..622efcd63d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.922.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 68015ef10c14ec9f21dfc3fa3718a71a1ec22aa1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 18:12:28 +0900
Subject: [PATCH 500/709] Fix argon reverse arrow becoming white after
 switching skins

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
index 3f13fe135e..9d44db3614 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonReverseArrow.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
 
             accentColour = hitObject.AccentColour.GetBoundCopy();
-            accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4));
+            accentColour.BindValueChanged(accent => icon.Colour = accent.NewValue.Darken(4), true);
         }
     }
 }

From fa3f53f39f59439a011f19a1886105ad91152810 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 12:37:21 +0300
Subject: [PATCH 501/709] Remove tablet prefix from error notification

---
 osu.Game/OsuGame.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7e6bd7c7be..1f0c27b286 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1037,18 +1037,21 @@ namespace osu.Game
 
         private void forwardTabletLogsToNotifications()
         {
+            const string tablet_prefix = @"[Tablet] ";
             bool notifyOnWarning = true;
 
             Logger.NewEntry += entry =>
             {
-                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(@"[Tablet]", StringComparison.Ordinal))
+                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.Ordinal))
                     return;
 
+                string message = entry.Message.Replace(tablet_prefix, string.Empty);
+
                 if (entry.Level == LogLevel.Error)
                 {
                     Schedule(() => Notifications.Post(new SimpleNotification
                     {
-                        Text = $"Encountered tablet error: \"{entry.Message}\"",
+                        Text = $"Encountered tablet error: \"{message}\"",
                         Icon = FontAwesome.Solid.PenSquare,
                         IconColour = Colours.RedDark,
                     }));

From ea7c5458fe091c61ca854be4640b48b4d3e5fd78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 18:43:41 +0900
Subject: [PATCH 502/709] Fix sprite dropdown not showing resources from
 non-legacy skins during gameplay

---
 .../Skinning/Legacy/LegacyNewStyleSpinner.cs    |  2 +-
 osu.Game/Skinning/ISkinTransformer.cs           | 17 +++++++++++++++++
 osu.Game/Skinning/LegacySkinTransformer.cs      |  5 +----
 osu.Game/Skinning/SkinnableSprite.cs            |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Skinning/ISkinTransformer.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
index d5cc469ca9..22944becf3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             var topProvider = source.FindProvider(s => s.GetTexture("spinner-top") != null);
 
-            if (topProvider is LegacySkinTransformer transformer && !(transformer.Skin is DefaultLegacySkin))
+            if (topProvider is ISkinTransformer transformer && !(transformer.Skin is DefaultLegacySkin))
             {
                 AddInternal(ApproachCircle = new Sprite
                 {
diff --git a/osu.Game/Skinning/ISkinTransformer.cs b/osu.Game/Skinning/ISkinTransformer.cs
new file mode 100644
index 0000000000..f985b8afcd
--- /dev/null
+++ b/osu.Game/Skinning/ISkinTransformer.cs
@@ -0,0 +1,17 @@
+// 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.
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// A skin transformer takes in an <see cref="ISkin"/> and applies transformations to it.
+    /// The most common use case is allowing individual rulesets to add skinnable components without directly coupling to underlying skins.
+    /// </summary>
+    public interface ISkinTransformer : ISkin
+    {
+        /// <summary>
+        /// The original skin that is being transformed.
+        /// </summary>
+        ISkin Skin { get; }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 8f2526db37..353ee067d1 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -18,11 +18,8 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Transformer used to handle support of legacy features for individual rulesets.
     /// </summary>
-    public abstract class LegacySkinTransformer : ISkin
+    public abstract class LegacySkinTransformer : ISkinTransformer
     {
-        /// <summary>
-        /// The <see cref="ISkin"/> which is being transformed.
-        /// </summary>
         [NotNull]
         public ISkin Skin { get; }
 
diff --git a/osu.Game/Skinning/SkinnableSprite.cs b/osu.Game/Skinning/SkinnableSprite.cs
index f8a9aaa6fb..5a39121b16 100644
--- a/osu.Game/Skinning/SkinnableSprite.cs
+++ b/osu.Game/Skinning/SkinnableSprite.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Skinning
                 {
                     foreach (var skin in skins)
                     {
-                        if (skin is LegacySkinTransformer transformer && isUserSkin(transformer.Skin))
+                        if (skin is ISkinTransformer transformer && isUserSkin(transformer.Skin))
                             return transformer.Skin;
 
                         if (isUserSkin(skin))

From f8e9a960ba1bc1756185eabee09c1b2201f4da99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 18:44:04 +0900
Subject: [PATCH 503/709] Fix argon skin not forwarding resource lookups to
 user backing

---
 .../Skinning/Argon/OsuArgonSkinTransformer.cs     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 8a1bf00877..1a569edc3e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -11,10 +11,13 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public class OsuArgonSkinTransformer : ISkin
+    public class OsuArgonSkinTransformer : ISkinTransformer
     {
+        public ISkin Skin { get; }
+
         public OsuArgonSkinTransformer(ISkin skin)
         {
+            Skin = skin;
         }
 
         public Drawable? GetDrawableComponent(ISkinComponent component)
@@ -55,15 +58,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             return null;
         }
 
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-        {
-            return null;
-        }
+        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public ISample? GetSample(ISampleInfo sampleInfo)
-        {
-            return null;
-        }
+        public ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
 
         public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
         {

From 74aefdc5bd690574d3d9ca369cbde4355595f28c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 18:50:19 +0900
Subject: [PATCH 504/709] Move basic transformer behaviour to base `abstract`
 class

---
 .../Skinning/Argon/OsuArgonSkinTransformer.cs | 23 +++----------
 osu.Game/Skinning/LegacySkinTransformer.cs    | 29 +++--------------
 osu.Game/Skinning/SkinTransformer.cs          | 32 +++++++++++++++++++
 3 files changed, 41 insertions(+), 43 deletions(-)
 create mode 100644 osu.Game/Skinning/SkinTransformer.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 1a569edc3e..3e5bfd25b5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -1,26 +1,20 @@
 // 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;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
-    public class OsuArgonSkinTransformer : ISkinTransformer
+    public class OsuArgonSkinTransformer : SkinTransformer
     {
-        public ISkin Skin { get; }
-
         public OsuArgonSkinTransformer(ISkin skin)
+            : base(skin)
         {
-            Skin = skin;
         }
 
-        public Drawable? GetDrawableComponent(ISkinComponent component)
+        public override Drawable? GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
@@ -55,16 +49,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     break;
             }
 
-            return null;
-        }
-
-        public Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
-
-        public ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
-
-        public IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull
-        {
-            return null;
+            return base.GetDrawableComponent(component);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index 353ee067d1..2de1564a5c 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -1,14 +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.
 
-#nullable disable
-
-using System;
-using JetBrains.Annotations;
 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.Objects.Legacy;
 using static osu.Game.Skinning.SkinConfiguration;
@@ -18,24 +11,14 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Transformer used to handle support of legacy features for individual rulesets.
     /// </summary>
-    public abstract class LegacySkinTransformer : ISkinTransformer
+    public abstract class LegacySkinTransformer : SkinTransformer
     {
-        [NotNull]
-        public ISkin Skin { get; }
-
-        protected LegacySkinTransformer([NotNull] ISkin skin)
+        protected LegacySkinTransformer(ISkin skin)
+            : base(skin)
         {
-            Skin = skin ?? throw new ArgumentNullException(nameof(skin));
         }
 
-        public virtual Drawable GetDrawableComponent(ISkinComponent component) => Skin.GetDrawableComponent(component);
-
-        public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
-
-        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
-            => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
-
-        public virtual ISample GetSample(ISampleInfo sampleInfo)
+        public override ISample? GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Skin.GetSample(sampleInfo);
@@ -44,9 +27,7 @@ namespace osu.Game.Skinning
             if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
                 return new SampleVirtual();
 
-            return Skin.GetSample(sampleInfo);
+            return base.GetSample(sampleInfo);
         }
-
-        public virtual IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Skin.GetConfig<TLookup, TValue>(lookup);
     }
 }
diff --git a/osu.Game/Skinning/SkinTransformer.cs b/osu.Game/Skinning/SkinTransformer.cs
new file mode 100644
index 0000000000..4da60f1e43
--- /dev/null
+++ b/osu.Game/Skinning/SkinTransformer.cs
@@ -0,0 +1,32 @@
+// 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 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
+{
+    public abstract class SkinTransformer : ISkinTransformer
+    {
+        public ISkin Skin { get; }
+
+        protected SkinTransformer(ISkin skin)
+        {
+            Skin = skin ?? throw new ArgumentNullException(nameof(skin));
+        }
+
+        public virtual Drawable? GetDrawableComponent(ISkinComponent component) => Skin.GetDrawableComponent(component);
+
+        public virtual Texture? GetTexture(string componentName) => GetTexture(componentName, default, default);
+
+        public virtual Texture? GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Skin.GetTexture(componentName, wrapModeS, wrapModeT);
+
+        public virtual ISample? GetSample(ISampleInfo sampleInfo) => Skin.GetSample(sampleInfo);
+
+        public virtual IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup) where TLookup : notnull where TValue : notnull => Skin.GetConfig<TLookup, TValue>(lookup);
+    }
+}

From 794a1319546163d2aa91b08a90d2a800f82393c1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 13:17:01 +0300
Subject: [PATCH 505/709] Update method name and conditions

---
 osu.Game/OsuGame.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1f0c27b286..ff974820a7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -188,7 +188,7 @@ namespace osu.Game
         {
             this.args = args;
 
-            forwardRuntimeLogsToNotifications();
+            forwardGeneralLogsToNotifications();
             forwardTabletLogsToNotifications();
 
             SentryLogger = new SentryLogger(this);
@@ -994,7 +994,7 @@ namespace osu.Game
                 overlay.Depth = (float)-Clock.CurrentTime;
         }
 
-        private void forwardRuntimeLogsToNotifications()
+        private void forwardGeneralLogsToNotifications()
         {
             int recentLogCount = 0;
 
@@ -1002,7 +1002,7 @@ namespace osu.Game
 
             Logger.NewEntry += entry =>
             {
-                if (entry.Level < LogLevel.Important || entry.Target == null) return;
+                if (entry.Level < LogLevel.Important || entry.Target > LoggingTarget.Database) return;
 
                 const int short_term_display_limit = 3;
 

From fd92bcdff255bfcf69d1dab1f54fdc4fc9b4fec2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 13:21:27 +0300
Subject: [PATCH 506/709] Ignore case sensitivity during message comparison

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff974820a7..474c855c3d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1042,7 +1042,7 @@ namespace osu.Game
 
             Logger.NewEntry += entry =>
             {
-                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.Ordinal))
+                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.OrdinalIgnoreCase))
                     return;
 
                 string message = entry.Message.Replace(tablet_prefix, string.Empty);

From 4528c1037b4fb5541364b54cf1a20c699e19fed3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 22 Sep 2022 19:26:12 +0900
Subject: [PATCH 507/709] Resolve CI inspections

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index e5b7208da6..88b6b9dd56 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;

From 5243ff3c2252b8a3bf37580018c8b7d753a1a6b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 19:16:49 +0900
Subject: [PATCH 508/709] Add argon combo colours

I'm 99% sure these are just test colours flyte was using, but they look good
so let's go with them. I've added two new colours to increase the default
combo colour rotation to 6. The initial ordering still matches, for whatever
that's worth.
---
 osu.Game/Skinning/ArgonSkin.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game/Skinning/ArgonSkin.cs b/osu.Game/Skinning/ArgonSkin.cs
index 2c17b28b01..010e2175e1 100644
--- a/osu.Game/Skinning/ArgonSkin.cs
+++ b/osu.Game/Skinning/ArgonSkin.cs
@@ -44,6 +44,28 @@ namespace osu.Game.Skinning
             : base(skin, resources)
         {
             this.resources = resources;
+
+            Configuration.CustomComboColours = new List<Color4>
+            {
+                // Standard combo progression order is green - blue - red - yellow.
+                // But for whatever reason, this starts from index 1, not 0.
+                //
+                // We've added two new combo colours in argon, so to ensure the initial rotation matches,
+                // this same progression is in slots 1 - 4.
+
+                // Orange
+                new Color4(241, 116, 0, 255),
+                // Green
+                new Color4(0, 241, 53, 255),
+                // Blue
+                new Color4(0, 82, 241, 255),
+                // Red
+                new Color4(241, 0, 0, 255),
+                // Yellow
+                new Color4(232, 235, 0, 255),
+                // Purple
+                new Color4(92, 0, 241, 255),
+            };
         }
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => Textures?.Get(componentName, wrapModeS, wrapModeT);

From 8f7a306d81a721878c7be093e17445e57f4ed3de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 19:53:16 +0900
Subject: [PATCH 509/709] Inline comment regarding margin necessity

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index c4d81e7e2a..05a04c3bae 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -96,6 +96,13 @@ namespace osu.Game.Screens.Play.HUD
 
             int displayCount = Math.Min(Flow.Count, maxPanels);
             Height = displayCount * (GameplayLeaderboardScore.PANEL_HEIGHT + Flow.Spacing.Y);
+            // Add extra margin space to flow equal to height of leaderboard.
+            // This ensures the content is always on screen, but also accounts for the fact that scroll operations
+            // without animation were actually forcing the local score to a location it can't usually reside at.
+            //
+            // Basically, the local score was in the scroll extension region (due to always trying to scroll the
+            // local player to the middle of the display, but there being no other content below the local player
+            // to scroll up by).
             Flow.Margin = new MarginPadding { Bottom = Height };
             requiresScroll = displayCount != Flow.Count;
 

From 7508592789b08cb27097449c36b0f78d32061dfe Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 22 Sep 2022 19:56:24 +0900
Subject: [PATCH 510/709] Clean up some checks

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index d5834c4329..569015dcd3 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Online.Leaderboards
                     throw new InvalidOperationException($"State {state} cannot be set by a leaderboard implementation.");
             }
 
-            Debug.Assert(scores.Any() != true);
+            Debug.Assert(scores.Any());
 
             setState(state);
         }
@@ -258,7 +258,7 @@ namespace osu.Game.Online.Leaderboards
                 .Expire();
             scoreFlowContainer = null;
 
-            if (scores.Any() != true)
+            if (scores.Any())
             {
                 setState(LeaderboardState.NoScores);
                 return;

From 8875f7ee4334fba722fd5999083ee6e485c99f2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 20:06:24 +0900
Subject: [PATCH 511/709] Add very basic follow point implementation for argon
 skin

This is just something to look better than the glowing mess which
triangles fallback was providing. This element hasn't been designed yet,
so I'm just filling in with something amicable for the time being.
---
 .../Skinning/Argon/ArgonFollowPoint.cs        | 39 +++++++++++++++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowPoint.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowPoint.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowPoint.cs
new file mode 100644
index 0000000000..47dae3c30a
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonFollowPoint.cs
@@ -0,0 +1,39 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonFollowPoint : CompositeDrawable
+    {
+        public ArgonFollowPoint()
+        {
+            Blending = BlendingParameters.Additive;
+
+            Colour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41"));
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new SpriteIcon
+                {
+                    Icon = FontAwesome.Solid.ChevronRight,
+                    Size = new Vector2(8),
+                    Colour = OsuColour.Gray(0.2f),
+                },
+                new SpriteIcon
+                {
+                    Icon = FontAwesome.Solid.ChevronRight,
+                    Size = new Vector2(8),
+                    X = 4,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 3e5bfd25b5..9ce4323c35 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.ReverseArrow:
                             return new ArgonReverseArrow();
+
+                        case OsuSkinComponents.FollowPoint:
+                            return new ArgonFollowPoint();
                     }
 
                     break;

From 37e25792443331c9dc8cbcdd0217273c11c36b83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 20:35:26 +0900
Subject: [PATCH 512/709] Fix reversed checks

---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 569015dcd3..206c15afde 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Online.Leaderboards
                     throw new InvalidOperationException($"State {state} cannot be set by a leaderboard implementation.");
             }
 
-            Debug.Assert(scores.Any());
+            Debug.Assert(!scores.Any());
 
             setState(state);
         }
@@ -258,7 +258,7 @@ namespace osu.Game.Online.Leaderboards
                 .Expire();
             scoreFlowContainer = null;
 
-            if (scores.Any())
+            if (!scores.Any())
             {
                 setState(LeaderboardState.NoScores);
                 return;

From a2ff31f37d73f55e449f17cf33f144de624923cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 20:43:38 +0900
Subject: [PATCH 513/709] Fix failing test

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 182cc51572..cca87d42a1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -250,11 +250,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestHitLightingColour()
         {
-            var fruitColour = SkinConfiguration.DefaultComboColours[1];
             AddStep("enable hit lighting", () => config.SetValue(OsuSetting.HitLighting, true));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
-            AddAssert("correct hit lighting colour", () =>
-                catcher.ChildrenOfType<HitExplosion>().First()?.Entry?.ObjectColour == fruitColour);
+            AddAssert("correct hit lighting colour", () => catcher.ChildrenOfType<HitExplosion>().First()?.Entry?.ObjectColour == this.ChildrenOfType<DrawableCatchHitObject>().First().AccentColour.Value);
         }
 
         [Test]

From 7527d815e83cbc3745c876d8115154df28f3aea4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 22 Sep 2022 20:58:23 +0900
Subject: [PATCH 514/709] Remove unused using

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index cca87d42a1..2dc99077d3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
 using osuTK;
 

From 6a0047b7a224dee2b012ffc922c8d73a2c2a55f6 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 22 Sep 2022 21:01:23 +0900
Subject: [PATCH 515/709] Update location of FullscreenCapability bindable

---
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 4 ++--
 osu.Game/Screens/Utility/LatencyCertifierScreen.cs            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 28642f12a1..c64a3101b7 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -73,8 +73,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 windowModes.BindTo(host.Window.SupportedWindowModes);
             }
 
-            if (host.Window is WindowsWindow windowsWindow)
-                fullscreenCapability.BindTo(windowsWindow.FullscreenCapability);
+            if (host.Renderer is IWindowsRenderer windowsRenderer)
+                fullscreenCapability.BindTo(windowsRenderer.FullscreenCapability);
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
index c9d4dc7811..bacaccd68e 100644
--- a/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
+++ b/osu.Game/Screens/Utility/LatencyCertifierScreen.cs
@@ -261,8 +261,8 @@ namespace osu.Game.Screens.Utility
 
             string exclusive = "unknown";
 
-            if (host.Window is WindowsWindow windowsWindow)
-                exclusive = windowsWindow.FullscreenCapability.ToString();
+            if (host.Renderer is IWindowsRenderer windowsRenderer)
+                exclusive = windowsRenderer.FullscreenCapability.ToString();
 
             statusText.Clear();
 

From e95758cfcd630170fb24f860800b9a13f9983661 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Sep 2022 20:39:46 +0900
Subject: [PATCH 516/709] Add basic "argon" cursor

---
 .../Skinning/Argon/ArgonCursor.cs             | 80 +++++++++++++++++++
 .../Skinning/Argon/ArgonCursorTrail.cs        | 29 +++++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |  6 ++
 3 files changed, 115 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursor.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursorTrail.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursor.cs
new file mode 100644
index 0000000000..446f3c83ae
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursor.cs
@@ -0,0 +1,80 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Osu.UI.Cursor;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonCursor : OsuCursorSprite
+    {
+        public ArgonCursor()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            InternalChildren = new[]
+            {
+                ExpandTarget = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    BorderThickness = 6,
+                    BorderColour = ColourInfo.GradientVertical(Colour4.FromHex("FC618F"), Colour4.FromHex("BB1A41")),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.4f,
+                            Colour = Colour4.FromHex("FC618F").Darken(0.6f),
+                        },
+                        new CircularContainer
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            BorderThickness = 2,
+                            BorderColour = Color4.White.Opacity(0.8f),
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    AlwaysPresent = true,
+                                },
+                            },
+                        },
+                    },
+                },
+                new Circle
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Scale = new Vector2(0.2f),
+                    Colour = new Color4(255, 255, 255, 255),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Radius = 20,
+                        Colour = new Color4(171, 255, 255, 100),
+                    },
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursorTrail.cs
new file mode 100644
index 0000000000..9bb3122a3b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonCursorTrail.cs
@@ -0,0 +1,29 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Osu.UI.Cursor;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonCursorTrail : CursorTrail
+    {
+        protected override float IntervalMultiplier => 0.4f;
+
+        protected override float FadeExponent => 4;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Texture = textures.Get(@"Cursor/cursortrail");
+            Scale = new Vector2(0.8f / Texture.ScaleAdjust);
+
+            Blending = BlendingParameters.Additive;
+
+            Alpha = 0.8f;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 9ce4323c35..ead49a8af2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -47,6 +47,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.FollowPoint:
                             return new ArgonFollowPoint();
+
+                        case OsuSkinComponents.Cursor:
+                            return new ArgonCursor();
+
+                        case OsuSkinComponents.CursorTrail:
+                            return new ArgonCursorTrail();
                     }
 
                     break;

From 3811ea113d993b9e2705cc3ed93a22b6d2d5cd01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Sep 2022 00:53:52 +0900
Subject: [PATCH 517/709] Adjust argon animations a bit

---
 .../Skinning/Argon/ArgonMainCirclePiece.cs             | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
index 0479b3ff3e..ffdcba3cdb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonMainCirclePiece.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         const double fade_out_time = 800;
 
                         const double flash_in_duration = 150;
-                        const double resize_duration = 300;
+                        const double resize_duration = 400;
 
                         const float shrink_size = 0.8f;
 
@@ -165,13 +165,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         // The outer gradient is resize with a slight delay from the border.
                         // This is to give it a bomb-like effect, with the border "triggering" its animation when getting close.
                         using (BeginDelayedSequence(flash_in_duration / 12))
+                        {
                             outerGradient.ResizeTo(outerGradient.Size * shrink_size, resize_duration, Easing.OutElasticHalf);
+                            outerGradient
+                                .FadeColour(Color4.White, 80)
+                                .Then()
+                                .FadeOut(flash_in_duration);
+                        }
 
                         // The flash layer starts white to give the wanted brightness, but is almost immediately
                         // recoloured to the accent colour. This would more correctly be done with two layers (one for the initial flash)
                         // but works well enough with the colour fade.
                         flash.FadeTo(1, flash_in_duration, Easing.OutQuint);
-                        flash.FlashColour(Color4.White, flash_in_duration, Easing.OutQuint);
+                        flash.FlashColour(accentColour.Value, fade_out_time, Easing.OutQuint);
 
                         this.FadeOut(fade_out_time, Easing.OutQuad);
                         break;

From e9c3478f69359f861ecadc1524461b8ffb735826 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 20:07:40 +0300
Subject: [PATCH 518/709] Add very basic "argon" spinner

---
 .../Skinning/Argon/ArgonSpinner.cs            | 146 +++++++++++
 .../Skinning/Argon/ArgonSpinnerDisc.cs        | 247 ++++++++++++++++++
 .../Skinning/Argon/ArgonSpinnerTicks.cs       |  61 +++++
 .../Skinning/Argon/OsuArgonSkinTransformer.cs |   3 +
 4 files changed, 457 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerTicks.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
new file mode 100644
index 0000000000..f9b2f84984
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -0,0 +1,146 @@
+// 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.Globalization;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSpinner : CompositeDrawable
+    {
+        private DrawableSpinner drawableSpinner = null!;
+
+        private OsuSpriteText bonusCounter = null!;
+
+        private Container spmContainer = null!;
+        private OsuSpriteText spmCounter = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            InternalChildren = new Drawable[]
+            {
+                bonusCounter = new OsuSpriteText
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Default.With(size: 24),
+                    Y = -120,
+                },
+                new ArgonSpinnerDisc
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                bonusCounter = new OsuSpriteText
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Default.With(size: 28, weight: FontWeight.Bold),
+                    Y = -120,
+                },
+                spmContainer = new Container
+                {
+                    Alpha = 0f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = 100,
+                    Children = new[]
+                    {
+                        spmCounter = new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"0",
+                            Font = OsuFont.Default.With(size: 28, weight: FontWeight.SemiBold)
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"SPINS PER MINUTE",
+                            Font = OsuFont.Default.With(size: 16, weight: FontWeight.SemiBold),
+                            Y = 30
+                        }
+                    }
+                }
+            };
+        }
+
+        private IBindable<double> gainedBonus = null!;
+        private IBindable<double> spinsPerMinute = null!;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.FadeOutFromOne(1500);
+                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+            });
+
+            spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
+            spinsPerMinute.BindValueChanged(spm =>
+            {
+                spmCounter.Text = Math.Truncate(spm.NewValue).ToString(@"#0");
+            }, true);
+
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!spmContainer.IsPresent && drawableSpinner.Result?.TimeStarted != null)
+                fadeCounterOnTimeStart();
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
+            fadeCounterOnTimeStart();
+        }
+
+        private void fadeCounterOnTimeStart()
+        {
+            if (drawableSpinner.Result?.TimeStarted is double startTime)
+            {
+                using (BeginAbsoluteSequence(startTime))
+                    spmContainer.FadeIn(drawableSpinner.HitObject.TimeFadeIn);
+            }
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableSpinner.IsNotNull())
+                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
new file mode 100644
index 0000000000..a6211ecb01
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
@@ -0,0 +1,247 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSpinnerDisc : CompositeDrawable
+    {
+        private const float initial_scale = 1.3f;
+        private const float idle_alpha = 0.2f;
+        private const float tracking_alpha = 0.4f;
+
+        private const float idle_centre_size = 80f;
+        private const float tracking_centre_size = 40f;
+
+        private DrawableSpinner drawableSpinner = null!;
+
+        private readonly BindableBool complete = new BindableBool();
+
+        private int wholeRotationCount;
+
+        private bool checkNewRotationCount
+        {
+            get
+            {
+                int rotations = (int)(drawableSpinner.Result.RateAdjustedRotation / 360);
+
+                if (wholeRotationCount == rotations) return false;
+
+                wholeRotationCount = rotations;
+                return true;
+            }
+        }
+
+        private Container disc = null!;
+        private Container centre = null!;
+        private CircularContainer fill = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            // we are slightly bigger than our parent, to clip the top and bottom of the circle
+            // this should probably be revisited when scaled spinners are a thing.
+            Scale = new Vector2(initial_scale);
+
+            InternalChildren = new Drawable[]
+            {
+                disc = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        fill = new CircularContainer
+                        {
+                            Name = @"Fill",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            EdgeEffect = new EdgeEffectParameters
+                            {
+                                Type = EdgeEffectType.Shadow,
+                                Colour = Colour4.FromHex("FC618F").Opacity(1f),
+                                Radius = 40,
+                            },
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0f,
+                                AlwaysPresent = true,
+                            }
+                        },
+                        new CircularContainer
+                        {
+                            Name = @"Ring",
+                            Masking = true,
+                            BorderColour = Color4.White,
+                            BorderThickness = 5,
+                            RelativeSizeAxes = Axes.Both,
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true,
+                            }
+                        },
+                        new ArgonSpinnerTicks(),
+                    }
+                },
+                centre = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(idle_centre_size),
+                    Children = new[]
+                    {
+                        new RingPiece(10)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.8f),
+                        },
+                        new RingPiece(3)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(1f),
+                        }
+                    },
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            complete.Value = Time.Current >= drawableSpinner.Result.TimeCompleted;
+
+            if (complete.Value)
+            {
+                if (checkNewRotationCount)
+                {
+                    fill.FinishTransforms(false, nameof(Alpha));
+                    fill
+                        .FadeTo(tracking_alpha + 0.2f, 60, Easing.OutExpo)
+                        .Then()
+                        .FadeTo(tracking_alpha, 250, Easing.OutQuint);
+                }
+            }
+            else
+            {
+                fill.Alpha = (float)Interpolation.Damp(fill.Alpha, drawableSpinner.RotationTracker.Tracking ? tracking_alpha : idle_alpha, 0.98f, (float)Math.Abs(Clock.ElapsedFrameTime));
+            }
+
+            if (centre.Width == idle_centre_size && drawableSpinner.Result?.TimeStarted != null)
+                updateCentrePieceSize();
+
+            const float initial_fill_scale = 0.1f;
+            float targetScale = initial_fill_scale + (0.98f - initial_fill_scale) * drawableSpinner.Progress;
+
+            fill.Scale = new Vector2((float)Interpolation.Lerp(fill.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
+            disc.Rotation = drawableSpinner.RotationTracker.Rotation;
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
+            Spinner spinner = drawableSpinner.HitObject;
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
+            {
+                this.ScaleTo(initial_scale);
+                this.RotateTo(0);
+
+                using (BeginDelayedSequence(spinner.TimePreempt / 2))
+                {
+                    // constant ambient rotation to give the spinner "spinning" character.
+                    this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
+                }
+
+                using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset))
+                {
+                    switch (state)
+                    {
+                        case ArmedState.Hit:
+                            this.ScaleTo(initial_scale * 1.2f, 320, Easing.Out);
+                            this.RotateTo(Rotation + 180, 320);
+                            break;
+
+                        case ArmedState.Miss:
+                            this.ScaleTo(initial_scale * 0.8f, 320, Easing.In);
+                            break;
+                    }
+                }
+            }
+
+            using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
+            {
+                centre.ScaleTo(0);
+                disc.ScaleTo(0);
+
+                using (BeginDelayedSequence(spinner.TimePreempt / 2))
+                {
+                    centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
+                    disc.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
+
+                    using (BeginDelayedSequence(spinner.TimePreempt / 2))
+                    {
+                        centre.ScaleTo(0.8f, spinner.TimePreempt / 2, Easing.OutQuint);
+                        disc.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
+                    }
+                }
+            }
+
+            if (drawableSpinner.Result?.TimeStarted != null)
+                updateCentrePieceSize();
+        }
+
+        private void updateCentrePieceSize()
+        {
+            Debug.Assert(drawableSpinner.Result?.TimeStarted != null);
+
+            Spinner spinner = drawableSpinner.HitObject;
+
+            using (BeginAbsoluteSequence(drawableSpinner.Result.TimeStarted.Value))
+                centre.ResizeTo(new Vector2(tracking_centre_size), spinner.TimePreempt / 2, Easing.OutQuint);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableSpinner.IsNotNull())
+                drawableSpinner.ApplyCustomUpdateState -= updateStateTransforms;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerTicks.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerTicks.cs
new file mode 100644
index 0000000000..0203432088
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerTicks.cs
@@ -0,0 +1,61 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Argon
+{
+    public class ArgonSpinnerTicks : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Origin = Anchor.Centre;
+            Anchor = Anchor.Centre;
+            RelativeSizeAxes = Axes.Both;
+
+            const float count = 25;
+
+            for (float i = 0; i < count; i++)
+            {
+                AddInternal(new CircularContainer
+                {
+                    RelativePositionAxes = Axes.Both,
+                    Masking = true,
+                    CornerRadius = 5,
+                    BorderColour = Color4.White,
+                    BorderThickness = 2f,
+                    Size = new Vector2(30, 5),
+                    Origin = Anchor.Centre,
+                    Position = new Vector2(
+                        0.5f + MathF.Sin(i / count * 2 * MathF.PI) / 2 * 0.75f,
+                        0.5f + MathF.Cos(i / count * 2 * MathF.PI) / 2 * 0.75f
+                    ),
+                    Rotation = -i / count * 360 - 120,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Colour = Colour4.White.Opacity(0.2f),
+                        Radius = 30,
+                    },
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                        }
+                    }
+                });
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 3e5bfd25b5..ba79d94937 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                         case OsuSkinComponents.SliderScorePoint:
                             return new ArgonSliderScorePoint();
 
+                        case OsuSkinComponents.SpinnerBody:
+                            return new ArgonSpinner();
+
                         case OsuSkinComponents.ReverseArrow:
                             return new ArgonReverseArrow();
                     }

From 49af80e17b099e02cb9a99b5f0b11dee7f1fba57 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 20:39:13 +0300
Subject: [PATCH 519/709] Remove 1.3x scale and adjust metrics with it

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs     | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
index f9b2f84984..95438e9588 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinner.cs
@@ -55,14 +55,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Font = OsuFont.Default.With(size: 28, weight: FontWeight.Bold),
-                    Y = -120,
+                    Y = -100,
                 },
                 spmContainer = new Container
                 {
                     Alpha = 0f,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Y = 100,
+                    Y = 60,
                     Children = new[]
                     {
                         spmCounter = new OsuSpriteText
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
index a6211ecb01..4669b5b913 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerDisc.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public class ArgonSpinnerDisc : CompositeDrawable
     {
-        private const float initial_scale = 1.3f;
+        private const float initial_scale = 1f;
         private const float idle_alpha = 0.2f;
         private const float tracking_alpha = 0.4f;
 

From a771d4031f5f7cf579167512ed35f3d99be800a8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 22 Sep 2022 21:27:06 +0300
Subject: [PATCH 520/709] Separate triangles-specific test steps to own scene

---
 .../TestSceneSpinnerRotation.cs               |  13 --
 .../TestSceneTrianglesSpinnerRotation.cs      | 149 ++++++++++++++++++
 2 files changed, 149 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneTrianglesSpinnerRotation.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index c01b2576e8..5fa4e24f5e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
@@ -43,7 +42,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
 
         private DrawableSpinner drawableSpinner = null!;
-        private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType<SpriteIcon>().Single();
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -77,7 +75,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             double finalCumulativeTrackerRotation = 0;
             double finalTrackerRotation = 0, trackerRotationTolerance = 0;
-            double finalSpinnerSymbolRotation = 0, spinnerSymbolRotationTolerance = 0;
 
             addSeekStep(spinner_start_time + 5000);
             AddStep("retrieve disc rotation", () =>
@@ -85,11 +82,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 finalTrackerRotation = drawableSpinner.RotationTracker.Rotation;
                 trackerRotationTolerance = Math.Abs(finalTrackerRotation * 0.05f);
             });
-            AddStep("retrieve spinner symbol rotation", () =>
-            {
-                finalSpinnerSymbolRotation = spinnerSymbol.Rotation;
-                spinnerSymbolRotationTolerance = Math.Abs(finalSpinnerSymbolRotation * 0.05f);
-            });
             AddStep("retrieve cumulative disc rotation", () => finalCumulativeTrackerRotation = drawableSpinner.Result.RateAdjustedRotation);
 
             addSeekStep(spinner_start_time + 2500);
@@ -98,8 +90,6 @@ namespace osu.Game.Rulesets.Osu.Tests
                 // due to the exponential damping applied we're allowing a larger margin of error of about 10%
                 // (5% relative to the final rotation value, but we're half-way through the spin).
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation / 2).Within(trackerRotationTolerance));
-            AddAssert("symbol rotation rewound",
-                () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation / 2).Within(spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation rewound",
                 // cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
                 () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation / 2).Within(100));
@@ -107,8 +97,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addSeekStep(spinner_start_time + 5000);
             AddAssert("is disc rotation almost same",
                 () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation).Within(trackerRotationTolerance));
-            AddAssert("is symbol rotation almost same",
-                () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation).Within(spinnerSymbolRotationTolerance));
             AddAssert("is cumulative rotation almost same",
                 () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
         }
@@ -122,7 +110,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             addSeekStep(5000);
 
             AddAssert("disc spin direction correct", () => clockwise ? drawableSpinner.RotationTracker.Rotation > 0 : drawableSpinner.RotationTracker.Rotation < 0);
-            AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
         }
 
         private Replay flip(Replay scoreReplay) => new Replay
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneTrianglesSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneTrianglesSpinnerRotation.cs
new file mode 100644
index 0000000000..80e3af6cc0
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneTrianglesSpinnerRotation.cs
@@ -0,0 +1,149 @@
+// 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.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Skinning;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneTrianglesSpinnerRotation : TestSceneOsuPlayer
+    {
+        private const double spinner_start_time = 100;
+        private const double spinner_duration = 6000;
+
+        [Resolved]
+        private SkinManager skinManager { get; set; } = null!;
+
+        [Resolved]
+        private AudioManager audioManager { get; set; } = null!;
+
+        protected override bool Autoplay => true;
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
+            => new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
+
+        private DrawableSpinner drawableSpinner = null!;
+        private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType<SpriteIcon>().Single();
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("set triangles skin", () => skinManager.CurrentSkinInfo.Value = TrianglesSkin.CreateInfo().ToLiveUnmanaged());
+
+            AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
+            AddStep("retrieve spinner", () => drawableSpinner = (DrawableSpinner)Player.DrawableRuleset.Playfield.AllHitObjects.First());
+        }
+
+        [Test]
+        public void TestSymbolMiddleRewindingRotation()
+        {
+            double finalSpinnerSymbolRotation = 0, spinnerSymbolRotationTolerance = 0;
+
+            addSeekStep(spinner_start_time + 5000);
+            AddStep("retrieve spinner symbol rotation", () =>
+            {
+                finalSpinnerSymbolRotation = spinnerSymbol.Rotation;
+                spinnerSymbolRotationTolerance = Math.Abs(finalSpinnerSymbolRotation * 0.05f);
+            });
+
+            addSeekStep(spinner_start_time + 2500);
+            AddAssert("symbol rotation rewound",
+                () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation / 2).Within(spinnerSymbolRotationTolerance));
+
+            addSeekStep(spinner_start_time + 5000);
+            AddAssert("is symbol rotation almost same",
+                () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation).Within(spinnerSymbolRotationTolerance));
+        }
+
+        [Test]
+        public void TestSymbolRotationDirection([Values(true, false)] bool clockwise)
+        {
+            if (clockwise)
+                transformReplay(flip);
+
+            addSeekStep(5000);
+            AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
+        }
+
+        private Replay flip(Replay scoreReplay) => new Replay
+        {
+            Frames = scoreReplay
+                     .Frames
+                     .Cast<OsuReplayFrame>()
+                     .Select(replayFrame =>
+                     {
+                         var flippedPosition = new Vector2(OsuPlayfield.BASE_SIZE.X - replayFrame.Position.X, replayFrame.Position.Y);
+                         return new OsuReplayFrame(replayFrame.Time, flippedPosition, replayFrame.Actions.ToArray());
+                     })
+                     .Cast<ReplayFrame>()
+                     .ToList()
+        };
+
+        private void addSeekStep(double time)
+        {
+            AddStep($"seek to {time}", () => Player.GameplayClockContainer.Seek(time));
+            AddUntilStep("wait for seek to finish", () => Player.DrawableRuleset.FrameStableClock.CurrentTime, () => Is.EqualTo(time).Within(100));
+        }
+
+        private void transformReplay(Func<Replay, Replay> replayTransformation) => AddStep("set replay", () =>
+        {
+            var drawableRuleset = this.ChildrenOfType<DrawableOsuRuleset>().Single();
+            var score = drawableRuleset.ReplayScore;
+            var transformedScore = new Score
+            {
+                ScoreInfo = score.ScoreInfo,
+                Replay = replayTransformation.Invoke(score.Replay)
+            };
+            drawableRuleset.SetReplayScore(transformedScore);
+        });
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
+        {
+            HitObjects = new List<HitObject>
+            {
+                new Spinner
+                {
+                    Position = new Vector2(256, 192),
+                    StartTime = spinner_start_time,
+                    Duration = spinner_duration
+                },
+            }
+        };
+
+        private class ScoreExposedPlayer : TestPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            public ScoreExposedPlayer()
+                : base(false, false)
+            {
+            }
+        }
+    }
+}

From d538295ad5712af0d7124ac4131e383219845459 Mon Sep 17 00:00:00 2001
From: Pasi4K5 <pascal.pomper03@gmail.com>
Date: Thu, 22 Sep 2022 23:04:43 +0200
Subject: [PATCH 521/709] Add `TestSceneOsuModRandom`

---
 .../Mods/TestSceneOsuModRandom.cs             | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
new file mode 100644
index 0000000000..c24ba6d530
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModRandom.cs
@@ -0,0 +1,102 @@
+// 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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModRandom : OsuModTestScene
+    {
+        [TestCase(1)]
+        [TestCase(7)]
+        [TestCase(10)]
+        public void TestDefaultBeatmap(float angleSharpness) => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModRandom
+            {
+                AngleSharpness = { Value = angleSharpness }
+            },
+            Autoplay = true,
+            PassCondition = () => true
+        });
+
+        [TestCase(1)]
+        [TestCase(7)]
+        [TestCase(10)]
+        public void TestJumpBeatmap(float angleSharpness) => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModRandom
+            {
+                AngleSharpness = { Value = angleSharpness }
+            },
+            Beatmap = jumpBeatmap,
+            Autoplay = true,
+            PassCondition = () => true
+        });
+
+        [TestCase(1)]
+        [TestCase(7)]
+        [TestCase(10)]
+        public void TestStreamBeatmap(float angleSharpness) => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModRandom
+            {
+                AngleSharpness = { Value = angleSharpness }
+            },
+            Beatmap = streamBeatmap,
+            Autoplay = true,
+            PassCondition = () => true
+        });
+
+        private OsuBeatmap jumpBeatmap =>
+            createHitCircleBeatmap(new[] { 100, 200, 300, 400 }, 8, 300, 2 * 300);
+
+        private OsuBeatmap streamBeatmap =>
+            createHitCircleBeatmap(new[] { 10, 20, 30, 40, 50, 60, 70, 80 }, 16, 150, 4 * 150);
+
+        private OsuBeatmap createHitCircleBeatmap(IEnumerable<int> spacings, int objectsPerSpacing, int interval, int beatLength)
+        {
+            var controlPointInfo = new ControlPointInfo();
+            controlPointInfo.Add(0, new TimingControlPoint
+            {
+                Time = 0,
+                BeatLength = beatLength
+            });
+
+            var beatmap = new OsuBeatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    StackLeniency = 0,
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        ApproachRate = 8.5f
+                    }
+                },
+                ControlPointInfo = controlPointInfo
+            };
+
+            foreach (int spacing in spacings)
+            {
+                for (int i = 0; i < objectsPerSpacing; i++)
+                {
+                    beatmap.HitObjects.Add(new HitCircle
+                    {
+                        StartTime = interval * beatmap.HitObjects.Count,
+                        Position = beatmap.HitObjects.Count % 2 == 0 ? Vector2.Zero : new Vector2(spacing, 0),
+                        NewCombo = i == 0
+                    });
+                }
+            }
+
+            return beatmap;
+        }
+    }
+}

From a65a76f7de5de1f3f298359cdcbd99b3d2c20069 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Sep 2022 20:05:12 +0900
Subject: [PATCH 522/709] Fix off-thread drawable mutation in multiplayer
 settings overlay when an error occurs

Closes #20413.
---
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 75bd6eb04d..15138b18b0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -424,7 +424,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void hideError() => ErrorText.FadeOut(50);
 
-            private void onSuccess(Room room)
+            private void onSuccess(Room room) => Schedule(() =>
             {
                 Debug.Assert(applyingSettingsOperation != null);
 
@@ -432,9 +432,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 applyingSettingsOperation.Dispose();
                 applyingSettingsOperation = null;
-            }
+            });
 
-            private void onError(string text)
+            private void onError(string text) => Schedule(() =>
             {
                 Debug.Assert(applyingSettingsOperation != null);
 
@@ -455,7 +455,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 applyingSettingsOperation.Dispose();
                 applyingSettingsOperation = null;
-            }
+            });
         }
 
         public class CreateOrUpdateButton : TriangleButton

From 4e9053b0996fb2714a041196e58fa300d9a4df21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Sep 2022 20:10:57 +0900
Subject: [PATCH 523/709] Fix crash when storyboard attempts to play at main
 menu

---
 .../Drawables/DrawableStoryboardAnimation.cs           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 369a3ee7ba..d1dc2b5d83 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Screens.Play;
+using osu.Game.Beatmaps;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -91,6 +91,9 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private ISkinSource skin { get; set; }
 
+        [Resolved]
+        private IBeatSyncProvider beatSyncProvider { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
         {
@@ -116,9 +119,6 @@ namespace osu.Game.Storyboards.Drawables
             Animation.ApplyTransforms(this);
         }
 
-        [Resolved]
-        private IGameplayClock gameplayClock { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -128,7 +128,7 @@ namespace osu.Game.Storyboards.Drawables
             //
             // In the case of storyboard animations, we want to synchronise with game time perfectly
             // so let's get a correct time based on gameplay clock and earliest transform.
-            PlaybackPosition = gameplayClock.CurrentTime - Animation.EarliestTransformTime;
+            PlaybackPosition = (beatSyncProvider?.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
         }
 
         private void skinSourceChanged()

From 0fa5e1b28e0e8d9b00ebe6d85fd6517b958a5656 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Sep 2022 20:18:44 +0900
Subject: [PATCH 524/709] Fix intermittent leaderboard crash due to request
 finishing after drawable is disposed

---
 osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 0f6ac2b455..ffb13dc458 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -153,10 +153,11 @@ namespace osu.Game.Screens.Select.Leaderboards
 
             var req = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
 
-            req.Success += r => SetScores(
+            // Schedule is required to avoid potential object disposed exception when LoadComponentAsync is eventually called.
+            req.Success += r => Schedule(() => SetScores(
                 scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
                 r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
-            );
+            ));
 
             return req;
         }

From 965d0603ce4346f6be847568336eff24c4b469e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Sep 2022 21:11:25 +0900
Subject: [PATCH 525/709] Fix slider tick colour not being applied properly

---
 osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs
index 1ab546b613..4c6b9a2f17 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSliderScorePoint.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
             };
 
             accentColour = hitObject.AccentColour.GetBoundCopy();
-            accentColour.BindValueChanged(accent => BorderColour = accent.NewValue);
+            accentColour.BindValueChanged(accent => BorderColour = accent.NewValue, true);
         }
     }
 }

From 0e38ff07c74de55cfc640361f51b8ea5658171d9 Mon Sep 17 00:00:00 2001
From: NullifiedJosh <86538544+NullifiedJosh@users.noreply.github.com>
Date: Fri, 23 Sep 2022 20:19:56 +0800
Subject: [PATCH 526/709] Check if relax is one of the mods, if so hide.

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index ef2936ac94..07968e4bee 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
@@ -26,9 +27,15 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool UserScrollSpeedAdjustment => false;
 
+        private bool showMobileMapper = true;
+
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
+            // Check if mods have RelaxMod instance
+            if (mods.OfType<ModRelax>().Any())
+                showMobileMapper = false;
+
             Direction.Value = ScrollingDirection.Down;
             TimeRange.Value = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450);
         }
@@ -36,7 +43,8 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            KeyBindingInputManager.Add(new CatchTouchInputMapper());
+            if (showMobileMapper)
+                KeyBindingInputManager.Add(new CatchTouchInputMapper());
         }
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);

From 4bd92b89bcee77c01a7050648020518018e3f8e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Sep 2022 16:29:19 +0300
Subject: [PATCH 527/709] Change test scene to ensure progress notification is
 closed on completion

---
 .../Visual/UserInterface/TestSceneNotificationOverlay.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index b314d95597..47958f4a41 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -465,7 +465,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             base.Update();
 
-            progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed);
+            progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed && n.WasClosed);
 
             if (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
             {

From cdc3afac88b3ac203ab6999ce2c8dbdc37906909 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Sep 2022 16:30:07 +0300
Subject: [PATCH 528/709] Fix update progress notification not closing on
 completion

---
 osu.Game/Updater/UpdateManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 100464029b..7b540cb564 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -156,6 +156,7 @@ namespace osu.Game.Updater
                 switch (State)
                 {
                     case ProgressNotificationState.Cancelled:
+                    case ProgressNotificationState.Completed:
                         base.Close(runFlingAnimation);
                         break;
                 }

From 835cae30872e3ffa5f196dd3ffcd9ec7347609b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 23 Sep 2022 17:06:55 +0300
Subject: [PATCH 529/709] Remove null conditional

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index d1dc2b5d83..07e1e86617 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Storyboards.Drawables
             //
             // In the case of storyboard animations, we want to synchronise with game time perfectly
             // so let's get a correct time based on gameplay clock and earliest transform.
-            PlaybackPosition = (beatSyncProvider?.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
+            PlaybackPosition = (beatSyncProvider.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
         }
 
         private void skinSourceChanged()

From 6c8e587344581907013d223200c9b4dd3b10e96e Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 24 Sep 2022 21:52:16 +0300
Subject: [PATCH 530/709] Move margin value to constant

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 6eddc7da83..687731d068 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Overlays
         private const float transition_length = 800;
         private const float progress_height = 10;
         private const float bottom_black_area_height = 55;
+        private const float margin = 10;
 
         private Drawable background;
         private ProgressBar progressBar;
@@ -69,7 +70,7 @@ namespace osu.Game.Overlays
         public NowPlayingOverlay()
         {
             Width = 400;
-            Margin = new MarginPadding(10);
+            Margin = new MarginPadding(margin);
         }
 
         [BackgroundDependencyLoader]
@@ -194,7 +195,7 @@ namespace osu.Game.Overlays
                 LoadComponentAsync(playlist = new PlaylistOverlay
                 {
                     RelativeSizeAxes = Axes.X,
-                    Y = player_height + 10,
+                    Y = player_height + margin,
                 }, _ =>
                 {
                     dragContainer.Add(playlist);

From 5d0b2d34c9289eb79a26aa58e238ee24c56e14f0 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 24 Sep 2022 23:35:06 +0300
Subject: [PATCH 531/709] Make playlist to always be in screen bounds

---
 osu.Game/Overlays/Music/PlaylistOverlay.cs |  5 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs     | 27 +++++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 9fe2fd5279..63f1aa248c 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -24,7 +25,7 @@ namespace osu.Game.Overlays.Music
     public class PlaylistOverlay : VisibilityContainer
     {
         private const float transition_duration = 600;
-        private const float playlist_height = 510;
+        public const float PLAYLIST_HEIGHT = 510;
 
         private readonly BindableList<Live<BeatmapSetInfo>> beatmapSets = new BindableList<Live<BeatmapSetInfo>>();
 
@@ -130,7 +131,7 @@ namespace osu.Game.Overlays.Music
             filter.Search.HoldFocus = true;
             Schedule(() => filter.Search.TakeFocus());
 
-            this.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint);
+            this.ResizeTo(new Vector2(1, RelativeSizeAxes.HasFlagFast(Axes.Y) ? 1f : PLAYLIST_HEIGHT), transition_duration, Easing.OutQuint);
             this.FadeIn(transition_duration, Easing.OutQuint);
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 687731d068..900b4bebf0 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -54,6 +54,7 @@ namespace osu.Game.Overlays
 
         private Container dragContainer;
         private Container playerContainer;
+        private Container playlistContainer;
 
         protected override string PopInSampleName => "UI/now-playing-pop-in";
         protected override string PopOutSampleName => "UI/now-playing-pop-out";
@@ -83,7 +84,6 @@ namespace osu.Game.Overlays
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
                         playerContainer = new Container
@@ -183,8 +183,13 @@ namespace osu.Game.Overlays
                                 }
                             },
                         },
+                        playlistContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Y = player_height + margin,
+                        }
                     }
-                }
+                },
             };
         }
 
@@ -194,11 +199,10 @@ namespace osu.Game.Overlays
             {
                 LoadComponentAsync(playlist = new PlaylistOverlay
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Y = player_height + margin,
+                    RelativeSizeAxes = Axes.Both,
                 }, _ =>
                 {
-                    dragContainer.Add(playlist);
+                    playlistContainer.Add(playlist);
 
                     playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
 
@@ -243,7 +247,18 @@ namespace osu.Game.Overlays
         {
             base.UpdateAfterChildren();
 
-            Height = dragContainer.Height;
+            playlistContainer.Height = MathF.Min(Parent.DrawHeight - margin * 3 - player_height, PlaylistOverlay.PLAYLIST_HEIGHT);
+
+            float height = player_height;
+
+            if (playlist != null)
+            {
+                height += playlist.DrawHeight;
+                if (playlist.State.Value == Visibility.Visible)
+                    height += margin;
+            }
+
+            Height = dragContainer.Height = height;
         }
 
         protected override void Update()

From 38f0524e88168b5ef0d175207fd938eb2251ea4b Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Sun, 25 Sep 2022 18:00:28 +0200
Subject: [PATCH 532/709] build: harden ci.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>
---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 082e0d247c..33ec3d6602 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   inspect-code:
     name: Code Quality

From 90dd3c3020c5df90fb48980a4fb9de03dd3b9d52 Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Sun, 25 Sep 2022 18:03:13 +0200
Subject: [PATCH 533/709] build: harden report-nunit.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>
---
 .github/workflows/report-nunit.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
index 358cbda17a..bfc9620174 100644
--- a/.github/workflows/report-nunit.yml
+++ b/.github/workflows/report-nunit.yml
@@ -8,8 +8,12 @@ on:
     workflows: ["Continuous Integration"]
     types:
       - completed
+permissions: {}
 jobs:
   annotate:
+    permissions:
+      checks: write # to create checks (dorny/test-reporter)
+
     name: Annotate CI run with test results
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}

From 68f62ca9cd653f0e9175be716ebd2ac492c3b6f7 Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Sun, 25 Sep 2022 18:04:27 +0200
Subject: [PATCH 534/709] build: harden sentry-release.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>
---
 .github/workflows/sentry-release.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml
index 442b97c473..cce3f23e5f 100644
--- a/.github/workflows/sentry-release.yml
+++ b/.github/workflows/sentry-release.yml
@@ -5,6 +5,9 @@ on:
     tags:
       - '*'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   sentry_release:
     runs-on: ubuntu-latest

From 537796c3a17fb049a4b417c1f6835e4ffd35d208 Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Sun, 25 Sep 2022 15:49:22 -0400
Subject: [PATCH 535/709] Cleanup mod bindings

---
 .../Mods/CatchModFlashlight.cs                |  8 +------
 .../Mods/CatchModNoScope.cs                   |  4 +---
 .../Mods/ManiaModFlashlight.cs                | 10 ++-------
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs   |  4 +---
 .../Mods/OsuModFlashlight.cs                  | 10 ++-------
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs      |  4 +---
 osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs   |  4 +---
 osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs    |  4 +---
 osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs    |  6 +----
 .../Mods/TaikoModFlashlight.cs                | 10 ++-------
 osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs    | 14 +++---------
 osu.Game/Rulesets/Mods/ModDoubleTime.cs       |  4 +---
 osu.Game/Rulesets/Mods/ModHalfTime.cs         |  4 +---
 osu.Game/Rulesets/Mods/ModMuted.cs            | 22 ++++---------------
 osu.Game/Rulesets/Mods/ModRandom.cs           |  6 +----
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  4 +---
 osu.Game/Rulesets/Mods/ModWindDown.cs         | 14 +++---------
 osu.Game/Rulesets/Mods/ModWindUp.cs           | 14 +++---------
 18 files changed, 30 insertions(+), 116 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index abe391ba4e..e8b126cfed 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -21,17 +21,11 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             MinValue = 0.5f,
             MaxValue = 1.5f,
-            Default = 1f,
-            Value = 1f,
             Precision = 0.1f
         };
 
         [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
-        public override BindableBool ComboBasedSize { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 350;
 
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs b/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
index 9038153e20..1b781b032c 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
@@ -22,10 +22,8 @@ namespace osu.Game.Rulesets.Catch.Mods
             "The combo count at which the catcher becomes completely hidden",
             SettingControlType = typeof(SettingsSlider<int, HiddenComboSlider>)
         )]
-        public override BindableInt HiddenComboCount { get; } = new BindableInt
+        public override BindableInt HiddenComboCount { get; } = new BindableInt(10)
         {
-            Default = 10,
-            Value = 10,
             MinValue = 0,
             MaxValue = 50,
         };
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
index 8ef5bfd94c..72ea1a2431 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
@@ -18,21 +18,15 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
 
         [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
-        public override BindableFloat SizeMultiplier { get; } = new BindableFloat
+        public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
             MaxValue = 3f,
-            Default = 1f,
-            Value = 1f,
             Precision = 0.1f
         };
 
         [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
-        public override BindableBool ComboBasedSize { get; } = new BindableBool
-        {
-            Default = false,
-            Value = false
-        };
+        public override BindableBool ComboBasedSize { get; } = new BindableBool();
 
         public override float DefaultFlashlightSize => 50;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index e624660410..b2980f5311 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -19,12 +19,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Hit them at the right size!";
 
         [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
-        public override BindableNumber<float> StartScale { get; } = new BindableFloat
+        public override BindableNumber<float> StartScale { get; } = new BindableFloat(2)
         {
             MinValue = 1f,
             MaxValue = 25f,
-            Default = 2f,
-            Value = 2f,
             Precision = 0.1f,
         };
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index e5a458488e..7b34fe05a9 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -33,21 +33,15 @@ namespace osu.Game.Rulesets.Osu.Mods
         };
 
         [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
-        public override BindableFloat SizeMultiplier { get; } = new BindableFloat
+        public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
             MaxValue = 2f,
-            Default = 1f,
-            Value = 1f,
             Precision = 0.1f
         };
 
         [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
-        public override BindableBool ComboBasedSize { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 180;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index b77c887cd3..b49257e289 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -19,12 +19,10 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override LocalisableString Description => "Hit them at the right size!";
 
         [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
-        public override BindableNumber<float> StartScale { get; } = new BindableFloat
+        public override BindableNumber<float> StartScale { get; } = new BindableFloat(0.5f)
         {
             MinValue = 0f,
             MaxValue = 0.99f,
-            Default = 0.5f,
-            Value = 0.5f,
             Precision = 0.01f,
         };
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs b/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
index 817f7b599c..84538cec30 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
@@ -27,10 +27,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             "The combo count at which the cursor becomes completely hidden",
             SettingControlType = typeof(SettingsSlider<int, HiddenComboSlider>)
         )]
-        public override BindableInt HiddenComboCount { get; } = new BindableInt
+        public override BindableInt HiddenComboCount { get; } = new BindableInt(10)
         {
-            Default = 10,
-            Value = 10,
             MinValue = 0,
             MaxValue = 50,
         };
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
index 78c7aa53f4..618fcfe05d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
@@ -29,10 +29,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModTarget)).ToArray();
 
         [SettingSource("Angle sharpness", "How sharp angles should be", SettingControlType = typeof(SettingsSlider<float>))]
-        public BindableFloat AngleSharpness { get; } = new BindableFloat
+        public BindableFloat AngleSharpness { get; } = new BindableFloat(7)
         {
-            Default = 7,
-            Value = 7,
             MinValue = 1,
             MaxValue = 10,
             Precision = 0.1f
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
index 861ad80b7f..406968ba08 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
@@ -53,11 +53,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         }).ToArray();
 
         [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(SettingsNumberBox))]
-        public Bindable<int?> Seed { get; } = new Bindable<int?>
-        {
-            Default = null,
-            Value = null
-        };
+        public Bindable<int?> Seed { get; } = new Bindable<int?>();
 
         [SettingSource("Metronome ticks", "Whether a metronome beat should play in the background")]
         public Bindable<bool> Metronome { get; } = new BindableBool(true);
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index 66616486df..05baf88a33 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -18,21 +18,15 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.12 : 1;
 
         [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
-        public override BindableFloat SizeMultiplier { get; } = new BindableFloat
+        public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
             MaxValue = 1.5f,
-            Default = 1f,
-            Value = 1f,
             Precision = 0.1f
         };
 
         [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
-        public override BindableBool ComboBasedSize { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 250;
 
diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index 697b303689..e7127abcf0 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -36,32 +36,24 @@ namespace osu.Game.Rulesets.Mods
         public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust), typeof(ModTimeRamp), typeof(ModAutoplay) };
 
         [SettingSource("Initial rate", "The starting speed of the track")]
-        public BindableNumber<double> InitialRate { get; } = new BindableDouble
+        public BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.5,
             MaxValue = 2,
-            Default = 1,
-            Value = 1,
             Precision = 0.01
         };
 
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
-        public BindableBool AdjustPitch { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public BindableBool AdjustPitch { get; } = new BindableBool(true);
 
         /// <summary>
         /// The instantaneous rate of the track.
         /// Every frame this mod will attempt to smoothly adjust this to meet <see cref="targetRate"/>.
         /// </summary>
-        public BindableNumber<double> SpeedChange { get; } = new BindableDouble
+        public BindableNumber<double> SpeedChange { get; } = new BindableDouble(1)
         {
             MinValue = min_allowable_rate,
             MaxValue = max_allowable_rate,
-            Default = 1,
-            Value = 1
         };
 
         // The two constants below denote the maximum allowable range of rates that `SpeedChange` can take.
diff --git a/osu.Game/Rulesets/Mods/ModDoubleTime.cs b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
index d8a41ae658..9e4469bf25 100644
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@@ -18,12 +18,10 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Zoooooooooom...";
 
         [SettingSource("Speed increase", "The actual increase to apply")]
-        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(1.5)
         {
             MinValue = 1.01,
             MaxValue = 2,
-            Default = 1.5,
-            Value = 1.5,
             Precision = 0.01,
         };
     }
diff --git a/osu.Game/Rulesets/Mods/ModHalfTime.cs b/osu.Game/Rulesets/Mods/ModHalfTime.cs
index 8d8b97e79e..7d858dca6f 100644
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@@ -18,12 +18,10 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Less zoom...";
 
         [SettingSource("Speed decrease", "The actual decrease to apply")]
-        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble
+        public override BindableNumber<double> SpeedChange { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
             MaxValue = 0.99,
-            Default = 0.75,
-            Value = 0.75,
             Precision = 0.01,
         };
     }
diff --git a/osu.Game/Rulesets/Mods/ModMuted.cs b/osu.Game/Rulesets/Mods/ModMuted.cs
index 9735d6b536..05ecd37000 100644
--- a/osu.Game/Rulesets/Mods/ModMuted.cs
+++ b/osu.Game/Rulesets/Mods/ModMuted.cs
@@ -36,34 +36,20 @@ namespace osu.Game.Rulesets.Mods
         private readonly BindableNumber<int> currentCombo = new BindableInt();
 
         [SettingSource("Enable metronome", "Add a metronome beat to help you keep track of the rhythm.")]
-        public BindableBool EnableMetronome { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public BindableBool EnableMetronome { get; } = new BindableBool(true);
 
         [SettingSource("Final volume at combo", "The combo count at which point the track reaches its final volume.", SettingControlType = typeof(SettingsSlider<int, MuteComboSlider>))]
-        public BindableInt MuteComboCount { get; } = new BindableInt
+        public BindableInt MuteComboCount { get; } = new BindableInt(100)
         {
-            Default = 100,
-            Value = 100,
             MinValue = 0,
             MaxValue = 500,
         };
 
         [SettingSource("Start muted", "Increase volume as combo builds.")]
-        public BindableBool InverseMuting { get; } = new BindableBool
-        {
-            Default = false,
-            Value = false
-        };
+        public BindableBool InverseMuting { get; } = new BindableBool();
 
         [SettingSource("Mute hit sounds", "Hit sounds are also muted alongside the track.")]
-        public BindableBool AffectsHitSounds { get; } = new BindableBool
-        {
-            Default = true,
-            Value = true
-        };
+        public BindableBool AffectsHitSounds { get; } = new BindableBool(true);
 
         protected ModMuted()
         {
diff --git a/osu.Game/Rulesets/Mods/ModRandom.cs b/osu.Game/Rulesets/Mods/ModRandom.cs
index 1f7742b075..178b9fb619 100644
--- a/osu.Game/Rulesets/Mods/ModRandom.cs
+++ b/osu.Game/Rulesets/Mods/ModRandom.cs
@@ -18,10 +18,6 @@ namespace osu.Game.Rulesets.Mods
         public override double ScoreMultiplier => 1;
 
         [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(SettingsNumberBox))]
-        public Bindable<int?> Seed { get; } = new Bindable<int?>
-        {
-            Default = null,
-            Value = null
-        };
+        public Bindable<int?> Seed { get; } = new Bindable<int?>();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 72a7f4b9a3..c4cb41fb6a 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -39,10 +39,8 @@ namespace osu.Game.Rulesets.Mods
         private double finalRateTime;
         private double beginRampTime;
 
-        public BindableNumber<double> SpeedChange { get; } = new BindableDouble
+        public BindableNumber<double> SpeedChange { get; } = new BindableDouble(1)
         {
-            Default = 1,
-            Value = 1,
             Precision = 0.01,
         };
 
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 22ed7c2efd..15ee37d481 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -18,31 +18,23 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
-        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.51,
             MaxValue = 2,
-            Default = 1,
-            Value = 1,
             Precision = 0.01,
         };
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]
-        public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+        public override BindableNumber<double> FinalRate { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
             MaxValue = 1.99,
-            Default = 0.75,
-            Value = 0.75,
             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 BindableBool AdjustPitch { get; } = new BindableBool(true);
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
 
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 13ece6d9a3..6d8838c5a5 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -18,31 +18,23 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
-        public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+        public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.5,
             MaxValue = 1.99,
-            Default = 1,
-            Value = 1,
             Precision = 0.01,
         };
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]
-        public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+        public override BindableNumber<double> FinalRate { get; } = new BindableDouble(1.5)
         {
             MinValue = 0.51,
             MaxValue = 2,
-            Default = 1.5,
-            Value = 1.5,
             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 BindableBool AdjustPitch { get; } = new BindableBool(true);
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
 

From feadac1f790fec56a1954cdab86f4deccfb9d68d Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:02:40 -0400
Subject: [PATCH 536/709] Cleanup all other leftover binding instantiation

---
 .../Online/TestAPIModJsonSerialization.cs          | 14 +++-----------
 .../Online/TestAPIModMessagePackSerialization.cs   | 14 +++-----------
 .../Visual/Settings/TestSceneSettingsItem.cs       | 12 ++----------
 .../Visual/Settings/TestSceneSettingsSource.cs     |  6 +-----
 .../UserInterface/TestSceneExpandingContainer.cs   |  8 ++------
 .../ControlPoints/DifficultyControlPoint.cs        |  1 -
 .../Beatmaps/ControlPoints/EffectControlPoint.cs   |  1 -
 .../Beatmaps/ControlPoints/SampleControlPoint.cs   |  1 -
 .../Beatmaps/ControlPoints/TimingControlPoint.cs   |  1 -
 .../UI/Scrolling/DrawableScrollingRuleset.cs       |  1 -
 .../Screens/Play/MasterGameplayClockContainer.cs   |  1 -
 .../Play/PlayerSettings/BeatmapOffsetControl.cs    |  2 --
 .../Play/PlayerSettings/PlaybackSettings.cs        |  1 -
 13 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 17709fb10f..da250c1e05 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -204,31 +204,23 @@ namespace osu.Game.Tests.Online
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
-            public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+            public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1.5)
             {
                 MinValue = 1,
                 MaxValue = 2,
-                Default = 1.5,
-                Value = 1.5,
                 Precision = 0.01,
             };
 
             [SettingSource("Final rate", "The speed increase to ramp towards")]
-            public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+            public override BindableNumber<double> FinalRate { get; } = new BindableDouble(0.5)
             {
                 MinValue = 0,
                 MaxValue = 1,
-                Default = 0.5,
-                Value = 0.5,
                 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 BindableBool AdjustPitch { get; } = new BindableBool(true);
         }
 
         private class TestModDifficultyAdjust : ModDifficultyAdjust
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index b17414e026..1d8cbffcdb 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -124,31 +124,23 @@ namespace osu.Game.Tests.Online
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
-            public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+            public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1.5)
             {
                 MinValue = 1,
                 MaxValue = 2,
-                Default = 1.5,
-                Value = 1.5,
                 Precision = 0.01,
             };
 
             [SettingSource("Final rate", "The speed increase to ramp towards")]
-            public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+            public override BindableNumber<double> FinalRate { get; } = new BindableDouble(0.5)
             {
                 MinValue = 0,
                 MaxValue = 1,
-                Default = 0.5,
-                Value = 0.5,
                 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 BindableBool AdjustPitch { get; } = new BindableBool(true);
         }
 
         private class TestModEnum : Mod
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
index b3d1966511..6ff53663ba 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
@@ -29,11 +29,7 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 Child = textBox = new SettingsTextBox
                 {
-                    Current = new Bindable<string>
-                    {
-                        Default = "test",
-                        Value = "test"
-                    }
+                    Current = new Bindable<string>("test")
                 };
             });
             AddUntilStep("wait for loaded", () => textBox.IsLoaded);
@@ -59,11 +55,7 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 Child = textBox = new SettingsTextBox
                 {
-                    Current = new Bindable<string>
-                    {
-                        Default = "test",
-                        Value = "test"
-                    }
+                    Current = new Bindable<string>("test")
                 };
             });
             AddUntilStep("wait for loaded", () => textBox.IsLoaded);
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
index dc2a687bd5..3cf6f7febf 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsSource.cs
@@ -67,11 +67,7 @@ namespace osu.Game.Tests.Visual.Settings
             };
 
             [SettingSource("Sample number textbox", "Textbox number entry", SettingControlType = typeof(SettingsNumberBox))]
-            public Bindable<int?> IntTextBoxBindable { get; } = new Bindable<int?>
-            {
-                Default = null,
-                Value = null
-            };
+            public Bindable<int?> IntTextBoxBindable { get; } = new Bindable<int?>();
         }
 
         private enum TestEnum
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
index 704185b117..20f173ab04 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
@@ -38,20 +38,16 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         slider1 = new ExpandableSlider<float, SizeSlider<float>>
                         {
-                            Current = new BindableFloat
+                            Current = new BindableFloat(1.0f)
                             {
-                                Default = 1.0f,
-                                MinValue = 1.0f,
                                 MaxValue = 10.0f,
                                 Precision = 0.01f,
                             },
                         },
                         slider2 = new ExpandableSlider<double>
                         {
-                            Current = new BindableDouble
+                            Current = new BindableDouble(1.0)
                             {
-                                Default = 1.0,
-                                MinValue = 1.0,
                                 MaxValue = 10.0,
                                 Precision = 0.01,
                             },
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index c199d1da59..e6f1609d7f 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public readonly BindableDouble SliderVelocityBindable = new BindableDouble(1)
         {
             Precision = 0.01,
-            Default = 1,
             MinValue = 0.1,
             MaxValue = 10
         };
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index ead07b4eaa..7c4313a015 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public readonly BindableDouble ScrollSpeedBindable = new BindableDouble(1)
         {
             Precision = 0.01,
-            Default = 1,
             MinValue = 0.01,
             MaxValue = 10
         };
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index 78dec67937..c454439c5c 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -45,7 +45,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         {
             MinValue = 0,
             MaxValue = 100,
-            Default = 100
         };
 
         /// <summary>
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 23d4d10fd8..61cc060594 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -49,7 +49,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableDouble BeatLengthBindable = new BindableDouble(DEFAULT_BEAT_LENGTH)
         {
-            Default = DEFAULT_BEAT_LENGTH,
             MinValue = 6,
             MaxValue = 60000
         };
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index d8a8a6ccd8..825aba5bc2 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -60,7 +60,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         protected readonly BindableDouble TimeRange = new BindableDouble(time_span_default)
         {
-            Default = time_span_default,
             MinValue = time_span_min,
             MaxValue = time_span_max
         };
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 047f25a111..c3c351ac36 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Screens.Play
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
-            Default = 1,
             MinValue = 0.5,
             MaxValue = 2,
             Precision = 0.1,
diff --git a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
index 75da8e7b9d..537f4d811a 100644
--- a/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         public BindableDouble Current { get; } = new BindableDouble
         {
-            Default = 0,
-            Value = 0,
             MinValue = -50,
             MaxValue = 50,
             Precision = 0.1,
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
index 12646d656a..14e3123028 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlaybackSettings.cs
@@ -17,7 +17,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         public readonly Bindable<double> UserPlaybackRate = new BindableDouble(1)
         {
-            Default = 1,
             MinValue = 0.5,
             MaxValue = 2,
             Precision = 0.1,

From 578f1e1e6c16fbf1001e4b5a8155ff35250fa695 Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:28:03 -0400
Subject: [PATCH 537/709] Fixes SizeMultiplier binding

---
 osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index e8b126cfed..41d4590aa8 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Catch.Mods
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.12 : 1;
 
         [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
-        public override BindableFloat SizeMultiplier { get; } = new BindableFloat
+        public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
             MaxValue = 1.5f,

From a9318e5c0418eba7867b43732005160e3ab58162 Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:31:04 -0400
Subject: [PATCH 538/709] Fixes small oversight

was applying a value when it wasn't supposed to be applied.
---
 .../Visual/UserInterface/TestSceneExpandingContainer.cs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
index 20f173ab04..04ca9accac 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
@@ -38,16 +38,20 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         slider1 = new ExpandableSlider<float, SizeSlider<float>>
                         {
-                            Current = new BindableFloat(1.0f)
+                            Current = new BindableFloat
                             {
+                                Default = 1.0f,
+                                MinValue = 1.0f,
                                 MaxValue = 10.0f,
                                 Precision = 0.01f,
                             },
                         },
                         slider2 = new ExpandableSlider<double>
                         {
-                            Current = new BindableDouble(1.0)
+                            Current = new BindableDouble
                             {
+                                Default = 1.0,
+                                MinValue = 1.0
                                 MaxValue = 10.0,
                                 Precision = 0.01,
                             },

From ced72126601f19287be2bbc8bfc52f59be8bd4ea Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Sun, 25 Sep 2022 16:33:39 -0400
Subject: [PATCH 539/709] Fixes syntax error

---
 .../Visual/UserInterface/TestSceneExpandingContainer.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
index 04ca9accac..704185b117 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneExpandingContainer.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                             Current = new BindableDouble
                             {
                                 Default = 1.0,
-                                MinValue = 1.0
+                                MinValue = 1.0,
                                 MaxValue = 10.0,
                                 Precision = 0.01,
                             },

From a7449380cda7920f23cbb6d2f034ec634dcdba16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 14:11:59 +0900
Subject: [PATCH 540/709] Fix osu! slider ticks appearing too late

---
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index 569e9b7c1c..676ff62455 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                 // This is so on repeats ticks don't appear too late to be visually processed by the player.
                 offset = 200;
             else
-                offset = TimeFadeIn * 0.66f;
+                offset = TimePreempt * 0.66f;
 
             TimePreempt = (StartTime - SpanStartTime) / 2 + offset;
         }

From 82d4689716e81d09c3a58596de54c288fbb45e02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 14:30:31 +0900
Subject: [PATCH 541/709] Add failing test showing progress notifications can
 be flung and cancelled

---
 .../TestSceneNotificationOverlay.cs           | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index b314d95597..895e62d41c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -107,9 +107,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("start drag", () =>
             {
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single());
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
                 InputManager.PressButton(MouseButton.Left);
-                InputManager.MoveMouseTo(notification.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
             });
 
             AddStep("fling away", () =>
@@ -123,6 +123,45 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("unread count zero", () => notificationOverlay.UnreadCount.Value == 0);
         }
 
+        [Test]
+        public void TestProgressNotificationCantBeFlung()
+        {
+            bool activated = false;
+            ProgressNotification notification = null!;
+
+            AddStep("post", () =>
+            {
+                activated = false;
+                notificationOverlay.Post(notification = new ProgressNotification
+                {
+                    Text = @"Uploading to BSS...",
+                    CompletionText = "Uploaded to BSS!",
+                    Activated = () => activated = true,
+                });
+
+                progressingNotifications.Add(notification);
+            });
+
+            AddStep("start drag", () =>
+            {
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single());
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(notificationOverlay.ChildrenOfType<Notification>().Single().ScreenSpaceDrawQuad.Centre + new Vector2(-500, 0));
+            });
+
+            AddStep("attempt fling", () =>
+            {
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddUntilStep("was not closed", () => !notification.WasClosed);
+            AddUntilStep("was not cancelled", () => notification.State == ProgressNotificationState.Active);
+            AddAssert("was not activated", () => !activated);
+            AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
+
+            AddUntilStep("was completed", () => notification.State == ProgressNotificationState.Completed);
+        }
+
         [Test]
         public void TestDismissWithoutActivationCloseButton()
         {

From b6dd8168d29313dafdfaeccc90bb4420896df7a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 14:30:40 +0900
Subject: [PATCH 542/709] Fix progress notifications being able to be flung

---
 osu.Game/Overlays/Notifications/Notification.cs         | 4 +++-
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index ea654e1272..8be9d2072b 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Overlays.Notifications
 
         public virtual bool Read { get; set; }
 
+        protected virtual bool AllowFlingDismiss => true;
+
         public new bool IsDragged => dragContainer.IsDragged;
 
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
@@ -315,7 +317,7 @@ namespace osu.Game.Overlays.Notifications
 
             protected override void OnDragEnd(DragEndEvent e)
             {
-                if (Rotation < -10 || velocity.X < -0.3f)
+                if (notification.AllowFlingDismiss && (Rotation < -10 || velocity.X < -0.3f))
                     notification.Close(true);
                 else if (X > 30 || velocity.X > 0.3f)
                     notification.ForwardToOverlay?.Invoke();
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 61bb22041e..4cf47013bd 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Overlays.Notifications
 
         public Func<bool>? CancelRequested { get; set; }
 
+        protected override bool AllowFlingDismiss => false;
+
         /// <summary>
         /// The function to post completion notifications back to.
         /// </summary>

From 4bd96108c01dc2453f7570475f2a04ac6ac463fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 14:45:17 +0900
Subject: [PATCH 543/709] Fix crash on game exit due to incorrect scheduling of
 realm change handler

---
 osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
index 82f49e0aef..4963de7251 100644
--- a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
+++ b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.FirstRunSetup
             beatmapSubscription?.Dispose();
         }
 
-        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error)
+        private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet? changes, Exception error) => Schedule(() =>
         {
             currentlyLoadedBeatmaps.Text = FirstRunSetupBeatmapScreenStrings.CurrentlyLoadedBeatmaps(sender.Count);
 
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays.FirstRunSetup
                 currentlyLoadedBeatmaps.ScaleTo(1.1f)
                                        .ScaleTo(1, 1500, Easing.OutQuint);
             }
-        }
+        });
 
         private void downloadTutorial()
         {

From c4887269f7b9096e038bd30bd50e2dd6b489e1d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 14:55:23 +0900
Subject: [PATCH 544/709] Avoid performing a realm write if there are no
 changes pending in `RulesetConfigManager`

---
 osu.Game/Rulesets/Configuration/RulesetConfigManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
index 5a03d66b84..4ff4f66665 100644
--- a/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
+++ b/osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Rulesets.Configuration
                 pendingWrites.Clear();
             }
 
+            if (!changed.Any())
+                return true;
+
             realm?.Write(r =>
             {
                 foreach (var c in changed)

From 43c16cb613cafcb35c1d862214322aff3e17b875 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 15:10:02 +0900
Subject: [PATCH 545/709] Fix potential crash from incorrect drawable mutation
 in tablet settings display

---
 .../Settings/Sections/Input/TabletSettings.cs        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 271438ed14..544259ddf1 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -215,21 +215,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             rotation.BindTo(tabletHandler.Rotation);
 
             areaOffset.BindTo(tabletHandler.AreaOffset);
-            areaOffset.BindValueChanged(val =>
+            areaOffset.BindValueChanged(val => Schedule(() =>
             {
                 offsetX.Value = val.NewValue.X;
                 offsetY.Value = val.NewValue.Y;
-            }, true);
+            }), true);
 
             offsetX.BindValueChanged(val => areaOffset.Value = new Vector2(val.NewValue, areaOffset.Value.Y));
             offsetY.BindValueChanged(val => areaOffset.Value = new Vector2(areaOffset.Value.X, val.NewValue));
 
             areaSize.BindTo(tabletHandler.AreaSize);
-            areaSize.BindValueChanged(val =>
+            areaSize.BindValueChanged(val => Schedule(() =>
             {
                 sizeX.Value = val.NewValue.X;
                 sizeY.Value = val.NewValue.Y;
-            }, true);
+            }), true);
 
             sizeX.BindValueChanged(val =>
             {
@@ -255,7 +255,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             });
 
             tablet.BindTo(tabletHandler.Tablet);
-            tablet.BindValueChanged(val =>
+            tablet.BindValueChanged(val => Schedule(() =>
             {
                 Scheduler.AddOnce(updateVisibility);
 
@@ -274,7 +274,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 sizeY.Default = sizeY.MaxValue = tab.Size.Y;
 
                 areaSize.Default = new Vector2(sizeX.Default, sizeY.Default);
-            }, true);
+            }), true);
         }
 
         private void updateVisibility()

From 4e9b25d8b0828039524974123f48d0215ef12ca2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 15:42:37 +0900
Subject: [PATCH 546/709] Move `MusicController` binds to `LoadComplete` for
 added thread safety

---
 osu.Game/Overlays/MusicController.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index da87336039..793b7e294f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -58,12 +58,11 @@ namespace osu.Game.Overlays
         [Resolved]
         private RealmAccess realm { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
-            // Todo: These binds really shouldn't be here, but are unlikely to cause any issues for now.
-            // They are placed here for now since some tests rely on setting the beatmap _and_ their hierarchies inside their load(), which runs before the MusicController's load().
-            beatmap.BindValueChanged(beatmapChanged, true);
+            base.LoadComplete();
+
+            beatmap.BindValueChanged(b => changeBeatmap(b.NewValue), true);
             mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
         }
 
@@ -263,8 +262,6 @@ namespace osu.Game.Overlays
 
         private IQueryable<BeatmapSetInfo> getBeatmapSets() => realm.Realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending);
 
-        private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap) => changeBeatmap(beatmap.NewValue);
-
         private void changeBeatmap(WorkingBeatmap newWorking)
         {
             // This method can potentially be triggered multiple times as it is eagerly fired in next() / prev() to ensure correct execution order

From 32d56fe3a959a40082094b3d9399e178039f8766 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 16:02:33 +0900
Subject: [PATCH 547/709] Use request cancellation and `IsDisposed` guard
 instead of more `Schedule`

---
 osu.Game/Online/Leaderboards/Leaderboard.cs     | 13 +++++++++----
 .../Select/Leaderboards/BeatmapLeaderboard.cs   | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 206c15afde..0f444a368a 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -185,10 +185,15 @@ namespace osu.Game.Online.Leaderboards
             if (scores != null)
                 this.scores.AddRange(scores);
 
-            // Schedule needs to be non-delayed here for the weird logic in refetchScores to work.
-            // If it is removed, the placeholder will be incorrectly updated to "no scores" rather than "retrieving".
-            // This whole flow should be refactored in the future.
-            Scheduler.Add(applyNewScores, false);
+            // Non-delayed schedule may potentially run inline (due to IsMainThread check passing) after leaderboard  is disposed.
+            // This is guarded against in BeatmapLeaderboard via web request cancellation, but let's be extra safe.
+            if (!IsDisposed)
+            {
+                // Schedule needs to be non-delayed here for the weird logic in refetchScores to work.
+                // If it is removed, the placeholder will be incorrectly updated to "no scores" rather than "retrieving".
+                // This whole flow should be refactored in the future.
+                Scheduler.Add(applyNewScores, false);
+            }
 
             void applyNewScores()
             {
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index ffb13dc458..50204db2bf 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private IDisposable scoreSubscription;
 
+        private GetScoresRequest scoreRetrievalRequest;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -151,15 +153,14 @@ namespace osu.Game.Screens.Select.Leaderboards
             else if (filterMods)
                 requestMods = mods.Value;
 
-            var req = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
+            scoreRetrievalRequest = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
 
-            // Schedule is required to avoid potential object disposed exception when LoadComponentAsync is eventually called.
-            req.Success += r => Schedule(() => SetScores(
-                scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
-                r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
-            ));
+            scoreRetrievalRequest.Success += response => SetScores(
+                scoreManager.OrderByTotalScore(response.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
+                response.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
+            );
 
-            return req;
+            return scoreRetrievalRequest;
         }
 
         protected override LeaderboardScore CreateDrawableScore(ScoreInfo model, int index) => new LeaderboardScore(model, index, IsOnlineScope)
@@ -219,7 +220,9 @@ namespace osu.Game.Screens.Select.Leaderboards
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             scoreSubscription?.Dispose();
+            scoreRetrievalRequest?.Cancel();
         }
     }
 }

From a1297af4410beba1dc8d1c5a24e9165eeea01b06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 16:12:47 +0900
Subject: [PATCH 548/709] Apply NRT to base `Leaderboard` classes

---
 .../SongSelect/TestSceneBeatmapLeaderboard.cs | 13 ++++------
 osu.Game/Online/Leaderboards/Leaderboard.cs   | 24 ++++++++-----------
 .../Leaderboards/UserTopScoreContainer.cs     | 10 ++++----
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 07da1790c8..1839821bb5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36,10 +34,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Cached(typeof(IDialogOverlay))]
         private readonly DialogOverlay dialogOverlay;
 
-        private ScoreManager scoreManager;
-
-        private RulesetStore rulesetStore;
-        private BeatmapManager beatmapManager;
+        private ScoreManager scoreManager = null!;
+        private RulesetStore rulesetStore = null!;
+        private BeatmapManager beatmapManager = null!;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -74,7 +71,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestLocalScoresDisplay()
         {
-            BeatmapInfo beatmapInfo = null;
+            BeatmapInfo beatmapInfo = null!;
 
             AddStep(@"Set scope", () => leaderboard.Scope = BeatmapLeaderboardScope.Local);
 
@@ -387,7 +384,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         private class FailableLeaderboard : BeatmapLeaderboard
         {
             public new void SetErrorState(LeaderboardState state) => base.SetErrorState(state);
-            public new void SetScores(IEnumerable<ScoreInfo> scores, ScoreInfo userScore = default) => base.SetScores(scores, userScore);
+            public new void SetScores(IEnumerable<ScoreInfo>? scores, ScoreInfo? userScore = null) => base.SetScores(scores, userScore);
         }
     }
 }
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 0f444a368a..69b4e5b209 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -1,14 +1,11 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Development;
@@ -54,23 +51,23 @@ namespace osu.Game.Online.Leaderboards
         private readonly Container placeholderContainer;
         private readonly UserTopScoreContainer<TScoreInfo> userScoreContainer;
 
-        private FillFlowContainer<LeaderboardScore> scoreFlowContainer;
+        private FillFlowContainer<LeaderboardScore>? scoreFlowContainer;
 
         private readonly LoadingSpinner loading;
 
-        private CancellationTokenSource currentFetchCancellationSource;
-        private CancellationTokenSource currentScoresAsyncLoadCancellationSource;
+        private CancellationTokenSource? currentFetchCancellationSource;
+        private CancellationTokenSource? currentScoresAsyncLoadCancellationSource;
 
-        private APIRequest fetchScoresRequest;
+        private APIRequest? fetchScoresRequest;
 
         private LeaderboardState state;
 
         [Resolved(CanBeNull = true)]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider? api { get; set; }
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
-        private TScope scope;
+        private TScope scope = default!;
 
         public TScope Scope
         {
@@ -179,7 +176,7 @@ namespace osu.Game.Online.Leaderboards
         /// </summary>
         /// <param name="scores">The scores to display.</param>
         /// <param name="userScore">The user top score, if any.</param>
-        protected void SetScores(IEnumerable<TScoreInfo> scores, TScoreInfo userScore = default)
+        protected void SetScores(IEnumerable<TScoreInfo>? scores, TScoreInfo? userScore = default)
         {
             this.scores.Clear();
             if (scores != null)
@@ -213,8 +210,7 @@ namespace osu.Game.Online.Leaderboards
         /// </summary>
         /// <param name="cancellationToken"></param>
         /// <returns>An <see cref="APIRequest"/> responsible for the fetch operation. This will be queued and performed automatically.</returns>
-        [CanBeNull]
-        protected abstract APIRequest FetchScores(CancellationToken cancellationToken);
+        protected abstract APIRequest? FetchScores(CancellationToken cancellationToken);
 
         protected abstract LeaderboardScore CreateDrawableScore(TScoreInfo model, int index);
 
@@ -298,7 +294,7 @@ namespace osu.Game.Online.Leaderboards
 
         #region Placeholder handling
 
-        private Placeholder placeholder;
+        private Placeholder? placeholder;
 
         private void setState(LeaderboardState state)
         {
@@ -325,7 +321,7 @@ namespace osu.Game.Online.Leaderboards
             placeholder.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 
-        private Placeholder getPlaceholderFor(LeaderboardState state)
+        private Placeholder? getPlaceholderFor(LeaderboardState state)
         {
             switch (state)
             {
diff --git a/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
index 2d2d82821c..391e8804f0 100644
--- a/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
+++ b/osu.Game/Online/Leaderboards/UserTopScoreContainer.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Threading;
 using osu.Framework.Bindables;
@@ -18,13 +16,15 @@ namespace osu.Game.Online.Leaderboards
     {
         private const int duration = 500;
 
-        public Bindable<TScoreInfo> Score = new Bindable<TScoreInfo>();
+        public Bindable<TScoreInfo?> Score = new Bindable<TScoreInfo?>();
 
         private readonly Container scoreContainer;
         private readonly Func<TScoreInfo, LeaderboardScore> createScoreDelegate;
 
         protected override bool StartHidden => true;
 
+        private CancellationTokenSource? loadScoreCancellation;
+
         public UserTopScoreContainer(Func<TScoreInfo, LeaderboardScore> createScoreDelegate)
         {
             this.createScoreDelegate = createScoreDelegate;
@@ -65,9 +65,7 @@ namespace osu.Game.Online.Leaderboards
             Score.BindValueChanged(onScoreChanged);
         }
 
-        private CancellationTokenSource loadScoreCancellation;
-
-        private void onScoreChanged(ValueChangedEvent<TScoreInfo> score)
+        private void onScoreChanged(ValueChangedEvent<TScoreInfo?> score)
         {
             var newScore = score.NewValue;
 

From 5fc836d1f09cebf983313c9b91a5c252890c607a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 16:15:18 +0900
Subject: [PATCH 549/709] Apply NRT to `BeatmapLeaderboard` /
 `MatchLeaderboard`

---
 .../Match/Components/MatchLeaderboard.cs      |  6 ++--
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 35 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 64644be965..ee5ee576d8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -16,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<long?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -33,7 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected override bool IsOnlineScope => true;
 
-        protected override APIRequest FetchScores(CancellationToken cancellationToken)
+        protected override APIRequest? FetchScores(CancellationToken cancellationToken)
         {
             if (roomId.Value == null)
                 return null;
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 50204db2bf..161d4847bf 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -25,11 +23,11 @@ namespace osu.Game.Screens.Select.Leaderboards
 {
     public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>
     {
-        public Action<ScoreInfo> ScoreSelected;
+        public Action<ScoreInfo>? ScoreSelected;
 
-        private BeatmapInfo beatmapInfo;
+        private BeatmapInfo? beatmapInfo;
 
-        public BeatmapInfo BeatmapInfo
+        public BeatmapInfo? BeatmapInfo
         {
             get => beatmapInfo;
             set
@@ -70,26 +68,26 @@ namespace osu.Game.Screens.Select.Leaderboards
         }
 
         [Resolved]
-        private ScoreManager scoreManager { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
-        private IDisposable scoreSubscription;
+        private IDisposable? scoreSubscription;
 
-        private GetScoresRequest scoreRetrievalRequest;
+        private GetScoresRequest? scoreRetrievalRequest;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -104,10 +102,9 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         protected override bool IsOnlineScope => Scope != BeatmapLeaderboardScope.Local;
 
-        protected override APIRequest FetchScores(CancellationToken cancellationToken)
+        protected override APIRequest? FetchScores(CancellationToken cancellationToken)
         {
             var fetchBeatmapInfo = BeatmapInfo;
-            var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
 
             if (fetchBeatmapInfo == null)
             {
@@ -115,13 +112,15 @@ namespace osu.Game.Screens.Select.Leaderboards
                 return null;
             }
 
+            var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
+
             if (Scope == BeatmapLeaderboardScope.Local)
             {
                 subscribeToLocalScores(fetchBeatmapInfo, cancellationToken);
                 return null;
             }
 
-            if (api?.IsLoggedIn != true)
+            if (!api.IsLoggedIn)
             {
                 SetErrorState(LeaderboardState.NotLoggedIn);
                 return null;
@@ -145,7 +144,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 return null;
             }
 
-            IReadOnlyList<Mod> requestMods = null;
+            IReadOnlyList<Mod>? requestMods = null;
 
             if (filterMods && !mods.Value.Any())
                 // add nomod for the request
@@ -186,7 +185,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                           + $" AND {nameof(ScoreInfo.DeletePending)} == false"
                     , beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged);
 
-            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception exception)
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception exception)
             {
                 if (cancellationToken.IsCancellationRequested)
                     return;

From 20da1051d9ab2e217f8895d4020683445618aa27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 16:21:23 +0900
Subject: [PATCH 550/709] Apply NRT to `GameplayLeaderboard` hierarchy

Just some cleanup work that I wanted to do as part of my last changes.
---
 .../Spectate/MultiSpectatorLeaderboard.cs     |  2 --
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
index c7af87a91d..4e9ab07e4c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Timing;
 using osu.Game.Online.Multiplayer;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 56756249b3..4201b3f4c9 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -12,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Graphics;
@@ -34,19 +33,20 @@ namespace osu.Game.Screens.Play.HUD
         public readonly SortedDictionary<int, BindableLong> TeamScores = new SortedDictionary<int, BindableLong>();
 
         [Resolved]
-        private OsuColour colours { get; set; }
+        private OsuColour colours { get; set; } = null!;
 
         [Resolved]
-        private SpectatorClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; } = null!;
 
         [Resolved]
-        private MultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; } = null!;
 
         [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        private Bindable<ScoringMode> scoringMode = null!;
 
         private readonly MultiplayerRoomUser[] playingUsers;
-        private Bindable<ScoringMode> scoringMode;
 
         private readonly IBindableList<int> playingUserIds = new BindableList<int>();
 
@@ -126,14 +126,17 @@ namespace osu.Game.Screens.Play.HUD
             playingUserIds.BindCollectionChanged(playingUsersChanged);
         }
 
-        protected override GameplayLeaderboardScore CreateLeaderboardScoreDrawable(IUser user, bool isTracked)
+        protected override GameplayLeaderboardScore CreateLeaderboardScoreDrawable(IUser? user, bool isTracked)
         {
             var leaderboardScore = base.CreateLeaderboardScoreDrawable(user, isTracked);
 
-            if (UserScores[user.OnlineID].Team is int team)
+            if (user != null)
             {
-                leaderboardScore.BackgroundColour = getTeamColour(team).Lighten(1.2f);
-                leaderboardScore.TextColour = Color4.White;
+                if (UserScores[user.OnlineID].Team is int team)
+                {
+                    leaderboardScore.BackgroundColour = getTeamColour(team).Lighten(1.2f);
+                    leaderboardScore.TextColour = Color4.White;
+                }
             }
 
             return leaderboardScore;
@@ -189,7 +192,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (spectatorClient != null)
+            if (spectatorClient.IsNotNull())
             {
                 foreach (var user in playingUsers)
                     spectatorClient.StopWatchingUser(user.UserID);

From 0f18bef3f366eff9de289c0eb5bad5a4657867d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 17:59:39 +0900
Subject: [PATCH 551/709] Fix incorrect test assumptions

---
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index db380cfdb7..c1a9768cf0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.PressButton(MouseButton.Left);
             });
 
-            AddUntilStep("wait for fetch", () => leaderboard.Scores != null);
+            AddUntilStep("wait for fetch", () => leaderboard.Scores.Any());
             AddUntilStep("score removed from leaderboard", () => leaderboard.Scores.All(s => s.OnlineID != scoreBeingDeleted.OnlineID));
 
             // "Clean up"
@@ -174,7 +174,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestDeleteViaDatabase()
         {
             AddStep("delete top score", () => scoreManager.Delete(importedScores[0]));
-            AddUntilStep("wait for fetch", () => leaderboard.Scores != null);
+            AddUntilStep("wait for fetch", () => leaderboard.Scores.Any());
             AddUntilStep("score removed from leaderboard", () => leaderboard.Scores.All(s => s.OnlineID != importedScores[0].OnlineID));
         }
     }

From 6e1edc4d8d81ada51e958d5920846790b97cedf3 Mon Sep 17 00:00:00 2001
From: abstrakt <abstrakt.osu@gmail.com>
Date: Mon, 26 Sep 2022 14:06:35 +0200
Subject: [PATCH 552/709] Use the `StackedEndPosition` to determine the jump
 distance in the `FlashlightEvaluator`.

Signed-off-by: abstrakt <abstrakt.osu@gmail.com>
---
 .../Difficulty/Evaluators/FlashlightEvaluator.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
index 2ba856d014..dabbfcd2fb 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
 
                 if (!(currentObj.BaseObject is Spinner))
                 {
-                    double jumpDistance = (osuHitObject.StackedPosition - currentHitObject.EndPosition).Length;
+                    double jumpDistance = (osuHitObject.StackedPosition - currentHitObject.StackedEndPosition).Length;
 
                     cumulativeStrainTime += lastObj.StrainTime;
 

From f81107eb5ac7dacb58c2b0955a975e0113eaf5e2 Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 20:07:43 +0800
Subject: [PATCH 553/709] add gameplay leaderboard config

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 54c545e367..8d1de971b3 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -131,6 +131,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             SetDefault(OsuSetting.FadePlayfieldWhenHealthLow, true);
             SetDefault(OsuSetting.KeyOverlay, false);
+            SetDefault(OsuSetting.GameplayLeaderboard, true);
             SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
 
             SetDefault(OsuSetting.FloatingComments, false);
@@ -294,6 +295,7 @@ namespace osu.Game.Configuration
         LightenDuringBreaks,
         ShowStoryboard,
         KeyOverlay,
+        GameplayLeaderboard,
         PositionalHitsounds,
         PositionalHitsoundsLevel,
         AlwaysPlayFirstComboBreak,

From bed25ff60e92b87d212a15281d65556e555e587c Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 20:08:26 +0800
Subject: [PATCH 554/709] add gameplay leaderboard config string

---
 osu.Game/Localisation/GameplaySettingsStrings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index 13cfcc3a19..40f39d927d 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -79,6 +79,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString AlwaysShowKeyOverlay => new TranslatableString(getKey(@"key_overlay"), @"Always show key overlay");
 
+        /// <summary>
+        /// "Always show gameplay leaderboard"
+        /// </summary>
+        public static LocalisableString AlwaysShowGameplayLeaderboard => new TranslatableString(getKey(@"gameplay_leaderboard"), @"Always show gameplay leaderboard");
+
         /// <summary>
         /// "Always play first combo break sound"
         /// </summary>

From dc051a8b7992ebf6f7a7b8f08da6b16ea8b97ee8 Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 20:08:58 +0800
Subject: [PATCH 555/709] add gameplay leaderboard config

---
 osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
index 0893af7d3e..12534c51a8 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
@@ -38,6 +38,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Current = config.GetBindable<bool>(OsuSetting.KeyOverlay),
                     Keywords = new[] { "counter" },
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = GameplaySettingsStrings.AlwaysShowGameplayLeaderboard,
+                    Current = config.GetBindable<bool>(OsuSetting.GameplayLeaderboard),
+                    Keywords = new[] { "leaderboard", "score" },
+                },
             };
         }
     }

From ee4d1b2d58cbb2d3c2fa51f65d88eea438f7e070 Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 20:13:07 +0800
Subject: [PATCH 556/709] add config visibility

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 2d816fbd55..b618ce907d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Users;
 using osuTK;
@@ -18,6 +20,10 @@ namespace osu.Game.Screens.Play.HUD
 {
     public abstract class GameplayLeaderboard : CompositeDrawable
     {
+
+        private const int duration = 100;
+
+        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
         private readonly Cached sorting = new Cached();
 
         public Bindable<bool> Expanded = new Bindable<bool>();
@@ -57,11 +63,19 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             Scheduler.AddDelayed(sort, 1000, true);
+
+            configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
         /// <summary>
@@ -193,5 +207,8 @@ namespace osu.Game.Screens.Play.HUD
             public override bool HandlePositionalInput => false;
             public override bool HandleNonPositionalInput => false;
         }
+
+        private void updateVisibility() =>
+            Flow.FadeTo(configVisibility.Value ? 1 : 0, duration);
     }
 }

From 5c132aadeb4fb60bd4dc0a50e3a9d5872643b0f1 Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 20:15:17 +0800
Subject: [PATCH 557/709] add visual test

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 72656c29b1..eb5846669f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -5,12 +5,14 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -24,6 +26,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly BindableDouble playerScore = new BindableDouble();
 
+        private Bindable<bool> configVisibility = new Bindable<bool>();
+
         public TestSceneGameplayLeaderboard()
         {
             AddStep("toggle expanded", () =>
@@ -35,6 +39,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
+        }
+
         [Test]
         public void TestLayoutWithManyScores()
         {
@@ -129,6 +139,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 => AddAssert($"leaderboard height is {panelCount} panels high", () => leaderboard.DrawHeight == (GameplayLeaderboardScore.PANEL_HEIGHT + leaderboard.Spacing) * panelCount);
         }
 
+        [Test]
+        public void TestVisibility()
+        {
+            createLeaderboard();
+            addLocalPlayer();
+
+            AddStep("set visible true", () => configVisibility.Value = true);
+            AddWaitStep("wait", 1);
+            AddAssert("is leaderboard fully visible", () => leaderboard.FlowAlpha == 1);
+
+            AddStep("set visible false", () => configVisibility.Value = false);
+            AddWaitStep("wait", 1);
+            AddAssert("is leaderboard fully invisible", () => leaderboard.FlowAlpha == 0);
+        }
+
         private void addLocalPlayer()
         {
             AddStep("add local player", () =>
@@ -163,6 +188,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public float Spacing => Flow.Spacing.Y;
 
+            public float FlowAlpha => Flow.Alpha;
+
             public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
                 var scoreItem = Flow.FirstOrDefault(i => i.User?.Username == username);

From 4295d9c169b5b1453162131909c6f58c95ff7cdb Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 21:11:14 +0800
Subject: [PATCH 558/709] revert

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 27 -------------------
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 17 ------------
 2 files changed, 44 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index eb5846669f..72656c29b1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -5,14 +5,12 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.PolygonExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osu.Game.Configuration;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -26,8 +24,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly BindableDouble playerScore = new BindableDouble();
 
-        private Bindable<bool> configVisibility = new Bindable<bool>();
-
         public TestSceneGameplayLeaderboard()
         {
             AddStep("toggle expanded", () =>
@@ -39,12 +35,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
-        }
-
         [Test]
         public void TestLayoutWithManyScores()
         {
@@ -139,21 +129,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 => AddAssert($"leaderboard height is {panelCount} panels high", () => leaderboard.DrawHeight == (GameplayLeaderboardScore.PANEL_HEIGHT + leaderboard.Spacing) * panelCount);
         }
 
-        [Test]
-        public void TestVisibility()
-        {
-            createLeaderboard();
-            addLocalPlayer();
-
-            AddStep("set visible true", () => configVisibility.Value = true);
-            AddWaitStep("wait", 1);
-            AddAssert("is leaderboard fully visible", () => leaderboard.FlowAlpha == 1);
-
-            AddStep("set visible false", () => configVisibility.Value = false);
-            AddWaitStep("wait", 1);
-            AddAssert("is leaderboard fully invisible", () => leaderboard.FlowAlpha == 0);
-        }
-
         private void addLocalPlayer()
         {
             AddStep("add local player", () =>
@@ -188,8 +163,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public float Spacing => Flow.Spacing.Y;
 
-            public float FlowAlpha => Flow.Alpha;
-
             public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
                 var scoreItem = Flow.FirstOrDefault(i => i.User?.Username == username);
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index b618ce907d..2d816fbd55 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,14 +3,12 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Users;
 using osuTK;
@@ -20,10 +18,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public abstract class GameplayLeaderboard : CompositeDrawable
     {
-
-        private const int duration = 100;
-
-        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
         private readonly Cached sorting = new Cached();
 
         public Bindable<bool> Expanded = new Bindable<bool>();
@@ -63,19 +57,11 @@ namespace osu.Game.Screens.Play.HUD
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             Scheduler.AddDelayed(sort, 1000, true);
-
-            configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
         /// <summary>
@@ -207,8 +193,5 @@ namespace osu.Game.Screens.Play.HUD
             public override bool HandlePositionalInput => false;
             public override bool HandleNonPositionalInput => false;
         }
-
-        private void updateVisibility() =>
-            Flow.FadeTo(configVisibility.Value ? 1 : 0, duration);
     }
 }

From 5d18001d7542159c2959ea75499b4ca5b6da8621 Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 21:11:38 +0800
Subject: [PATCH 559/709] move config

---
 .../Screens/Play/HUD/SoloGameplayLeaderboard.cs  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index eff7870d89..fb7e2ff00f 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
@@ -13,6 +15,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class SoloGameplayLeaderboard : GameplayLeaderboard
     {
+        private const int duration = 100;
+
+        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
         private readonly IUser trackingUser;
 
         public readonly IBindableList<ScoreInfo> Scores = new BindableList<ScoreInfo>();
@@ -31,10 +36,18 @@ namespace osu.Game.Screens.Play.HUD
             this.trackingUser = trackingUser;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
             Scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
+
+            configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
         private void showScores()
@@ -69,5 +82,8 @@ namespace osu.Game.Screens.Play.HUD
             // Local score should always show lower than any existing scores in cases of ties.
             local.DisplayOrder.Value = long.MaxValue;
         }
+
+        private void updateVisibility() =>
+            Flow.FadeTo(configVisibility.Value ? 1 : 0, duration);
     }
 }

From 1fab1db145843644699095a4ab319d832c84e5ae Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 21:11:48 +0800
Subject: [PATCH 560/709] move test

---
 .../TestSceneSoloGameplayLeaderboard.cs       | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index ac73e88468..cb48275e21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -9,11 +9,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -24,6 +26,16 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly BindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
 
+        private Bindable<bool> configVisibility = new Bindable<bool>();
+
+        private TestSoloGameplayLeaderboard? testSoloGameplayLeaderboard;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.GameplayLeaderboard, configVisibility);
+        }
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -37,7 +49,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Id = 2,
                 };
 
-                Child = new SoloGameplayLeaderboard(trackingUser)
+                Child = testSoloGameplayLeaderboard = new TestSoloGameplayLeaderboard(trackingUser)
                 {
                     Scores = { BindTarget = scores },
                     Anchor = Anchor.Centre,
@@ -57,6 +69,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.Combo.Value = v);
         }
 
+        [Test]
+        public void TestVisibility()
+        {
+            AddStep("set visible true", () => configVisibility.Value = true);
+            AddWaitStep("wait", 1);
+            AddAssert("is leaderboard fully visible", () => testSoloGameplayLeaderboard?.FlowAlpha == 1);
+
+            AddStep("set visible false", () => configVisibility.Value = false);
+            AddWaitStep("wait", 1);
+            AddAssert("is leaderboard fully invisible", () => testSoloGameplayLeaderboard?.FlowAlpha == 0);
+        }
+
         private static List<ScoreInfo> createSampleScores()
         {
             return new[]
@@ -68,5 +92,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new ScoreInfo { User = new APIUser { Username = @"Susko3" }, TotalScore = RNG.Next(500000, 1000000) },
             }.Concat(Enumerable.Range(0, 50).Select(i => new ScoreInfo { User = new APIUser { Username = $"User {i + 1}" }, TotalScore = 1000000 - i * 10000 })).ToList();
         }
+
+        private class TestSoloGameplayLeaderboard : SoloGameplayLeaderboard
+        {
+            public float FlowAlpha => Flow.Alpha;
+            public TestSoloGameplayLeaderboard(IUser trackingUser)
+            : base(trackingUser)
+            { }
+        }
     }
 }

From 214a1c2d7fede26719017d7e8dcf73838661d02a Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Mon, 26 Sep 2022 21:26:13 +0800
Subject: [PATCH 561/709] code factor

---
 .../Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index cb48275e21..128e8b6c8a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly BindableList<ScoreInfo> scores = new BindableList<ScoreInfo>();
 
-        private Bindable<bool> configVisibility = new Bindable<bool>();
+        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
 
         private TestSoloGameplayLeaderboard? testSoloGameplayLeaderboard;
 
@@ -96,9 +96,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestSoloGameplayLeaderboard : SoloGameplayLeaderboard
         {
             public float FlowAlpha => Flow.Alpha;
+
             public TestSoloGameplayLeaderboard(IUser trackingUser)
-            : base(trackingUser)
-            { }
+                : base(trackingUser)
+            {
+            }
         }
     }
 }

From 8aff856c793d8078d0217a6a0bf0cab837f37728 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 27 Sep 2022 05:18:13 +0300
Subject: [PATCH 562/709] Fix `SkinnableTestScene` sizing logic potentially
 failing to work

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index a8193701ef..f8f15e2729 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Tests.Visual
                 {
                     c.RelativeSizeAxes = Axes.None;
                     c.AutoSizeAxes = Axes.None;
+                    c.Size = Vector2.Zero;
 
                     c.RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None;
                     c.AutoSizeAxes = autoSize ? Axes.Both : Axes.None;

From de6709d12c5cd5f2d7d522d1f074095fe223e6f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 12:46:15 +0900
Subject: [PATCH 563/709] Fix `rank_history` serialisation order dependence

```csharp
[network] 2022-09-26 18:18:39 [verbose]: Processing response from https://dev.ppy.sh/api/v2/me/ failed with Newtonsoft.Json.JsonSerializationException: Error setting value to 'rankHistory' on 'osu.Game.Online.API.Requests.Responses.APIUser'.
[network] 2022-09-26 18:18:39 [verbose]: ---> System.NullReferenceException: Object reference not set to an instance of an object.
[network] 2022-09-26 18:18:39 [verbose]: at osu.Game.Online.API.Requests.Responses.APIUser.set_rankHistory(APIRankHistory
value) in /tmp/osu/osu.Game/Online/API/Requests/Responses/APIUser.cs:line 231
```
---
 osu.Game/Online/API/Requests/Responses/APIUser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUser.cs b/osu.Game/Online/API/Requests/Responses/APIUser.cs
index 5f843e9a7b..d3ddcffaf5 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUser.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUser.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"rank_history")]
         private APIRankHistory rankHistory
         {
-            set => statistics.RankHistory = value;
+            set => Statistics.RankHistory = value;
         }
 
         [JsonProperty("badges")]

From bac3108aea03fb72b9ccc146b6cfb7353cf8f63a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 14:29:59 +0900
Subject: [PATCH 564/709] Remove unnecessary keywords

---
 osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
index 12534c51a8..88a27840d8 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/HUDSettings.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = GameplaySettingsStrings.AlwaysShowGameplayLeaderboard,
                     Current = config.GetBindable<bool>(OsuSetting.GameplayLeaderboard),
-                    Keywords = new[] { "leaderboard", "score" },
                 },
             };
         }

From 320f134634fa3095c8522abc0b228c22f2671d92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 14:43:08 +0900
Subject: [PATCH 565/709] Use same logic as `KeyCounterDisplay`

---
 osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs | 9 ++++++++-
 osu.Game/Screens/Play/ReplayPlayer.cs                | 1 +
 osu.Game/Screens/Play/SoloPlayer.cs                  | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index fb7e2ff00f..471aaf9a6d 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -31,6 +31,12 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private ScoreManager scoreManager { get; set; } = null!;
 
+        /// <summary>
+        /// Whether the leaderboard should be visible regardless of the configuration value.
+        /// This is true by default, but can be changed.
+        /// </summary>
+        public readonly Bindable<bool> AlwaysVisible = new Bindable<bool>(true);
+
         public SoloGameplayLeaderboard(IUser trackingUser)
         {
             this.trackingUser = trackingUser;
@@ -47,6 +53,7 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
             Scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
 
+            AlwaysVisible.BindValueChanged(_ => updateVisibility());
             configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
@@ -84,6 +91,6 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         private void updateVisibility() =>
-            Flow.FadeTo(configVisibility.Value ? 1 : 0, duration);
+            this.FadeTo(AlwaysVisible.Value || configVisibility.Value ? 1 : 0, duration);
     }
 }
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 163b9c593f..5382e283e0 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.Play
         protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
             new SoloGameplayLeaderboard(Score.ScoreInfo.User)
             {
+                AlwaysVisible = { Value = true },
                 Scores = { BindTarget = LeaderboardScores }
             };
 
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index d7730737d6..ee19391b89 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Screens.Play
         protected override GameplayLeaderboard CreateGameplayLeaderboard() =>
             new SoloGameplayLeaderboard(Score.ScoreInfo.User)
             {
+                AlwaysVisible = { Value = false },
                 Scores = { BindTarget = LeaderboardScores }
             };
 

From 4260ace1a6d24ff2a5282a89d93646b5a75a508a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 14:46:35 +0900
Subject: [PATCH 566/709] Fix test coverage

---
 .../TestSceneSoloGameplayLeaderboard.cs       | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 128e8b6c8a..8e438e98b6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly Bindable<bool> configVisibility = new Bindable<bool>();
 
-        private TestSoloGameplayLeaderboard? testSoloGameplayLeaderboard;
+        private SoloGameplayLeaderboard leaderboard = null!;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
@@ -49,11 +49,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Id = 2,
                 };
 
-                Child = testSoloGameplayLeaderboard = new TestSoloGameplayLeaderboard(trackingUser)
+                Child = leaderboard = new SoloGameplayLeaderboard(trackingUser)
                 {
                     Scores = { BindTarget = scores },
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    AlwaysVisible = { Value = false },
                     Expanded = { Value = true },
                 };
             });
@@ -72,13 +73,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestVisibility()
         {
-            AddStep("set visible true", () => configVisibility.Value = true);
-            AddWaitStep("wait", 1);
-            AddAssert("is leaderboard fully visible", () => testSoloGameplayLeaderboard?.FlowAlpha == 1);
+            AddStep("set config visible true", () => configVisibility.Value = true);
+            AddUntilStep("leaderboard visible", () => leaderboard.Alpha == 1);
 
-            AddStep("set visible false", () => configVisibility.Value = false);
-            AddWaitStep("wait", 1);
-            AddAssert("is leaderboard fully invisible", () => testSoloGameplayLeaderboard?.FlowAlpha == 0);
+            AddStep("set config visible false", () => configVisibility.Value = false);
+            AddUntilStep("leaderboard not visible", () => leaderboard.Alpha == 0);
+
+            AddStep("set always visible", () => leaderboard.AlwaysVisible.Value = true);
+            AddUntilStep("leaderboard visible", () => leaderboard.Alpha == 1);
+
+            AddStep("set config visible true", () => configVisibility.Value = true);
+            AddAssert("leaderboard still visible", () => leaderboard.Alpha == 1);
         }
 
         private static List<ScoreInfo> createSampleScores()
@@ -92,15 +97,5 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new ScoreInfo { User = new APIUser { Username = @"Susko3" }, TotalScore = RNG.Next(500000, 1000000) },
             }.Concat(Enumerable.Range(0, 50).Select(i => new ScoreInfo { User = new APIUser { Username = $"User {i + 1}" }, TotalScore = 1000000 - i * 10000 })).ToList();
         }
-
-        private class TestSoloGameplayLeaderboard : SoloGameplayLeaderboard
-        {
-            public float FlowAlpha => Flow.Alpha;
-
-            public TestSoloGameplayLeaderboard(IUser trackingUser)
-                : base(trackingUser)
-            {
-            }
-        }
     }
 }

From 87a1e05641d596025c73f3a572560990d391eb69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 15:06:05 +0900
Subject: [PATCH 567/709] Remove unused using statement

---
 .../Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 8e438e98b6..6b52e934b7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

From 9dc0eb7fd02a81aebabb36a75c4573be545bf666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:04:56 +0900
Subject: [PATCH 568/709] Remove unused static

---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 076ce224f0..fce73d908f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
@@ -34,8 +33,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private static readonly int highest_divisor = BindableBeatDivisor.PREDEFINED_DIVISORS.Last();
-
         public TimelineTickDisplay()
         {
             RelativeSizeAxes = Axes.Both;

From ccae721af2577dca7141b534204b3c552ec46cc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:05:10 +0900
Subject: [PATCH 569/709] Ensure `ZoomableScrollContainer` content isn't shown
 until zoom is set

---
 .../Timeline/ZoomableScrollContainer.cs           | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 0fb59a8a1f..839b2b5bad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -56,7 +56,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected ZoomableScrollContainer()
             : base(Direction.Horizontal)
         {
-            base.Content.Add(zoomedContent = new Container { RelativeSizeAxes = Axes.Y });
+            base.Content.Add(zoomedContent = new Container
+            {
+                RelativeSizeAxes = Axes.Y,
+                // We must hide content until SetupZoom is called.
+                // If not, a child component that relies on its DrawWidth (via RelativeSizeAxes) may see a very incorrect value
+                // momentarily, as noticed in the TimelineTickDisplay, which would render thousands of ticks incorrectly.
+                Alpha = 0,
+            });
 
             AddLayout(zoomedContentWidthCache);
         }
@@ -94,6 +101,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             maxZoom = maximum;
             CurrentZoom = zoomTarget = initial;
             isZoomSetUp = true;
+
+            zoomedContent.Show();
         }
 
         /// <summary>
@@ -118,9 +127,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 CurrentZoom = zoomTarget = newZoom;
         }
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
+            base.UpdateAfterChildren();
 
             if (!zoomedContentWidthCache.IsValid)
                 updateZoomedContentWidth();

From e227519b093b4b2fb48dab6f5eabdf5364e8fa0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:18:45 +0900
Subject: [PATCH 570/709] Don't attempt to render timeline ticks until
 `DrawWidth` is above zero

---
 .../Timeline/TimelineTickDisplay.cs           | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index fce73d908f..9018c95a47 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -77,20 +77,19 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.Update();
 
-            if (timeline != null)
+            if (timeline == null || !(DrawWidth > 0)) return;
+
+            (float, float) newRange = (
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
+                (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
+
+            if (visibleRange != newRange)
             {
-                var newRange = (
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
+                visibleRange = newRange;
 
-                if (visibleRange != newRange)
-                {
-                    visibleRange = newRange;
-
-                    // actual regeneration only needs to occur if we've passed one of the known next min/max tick boundaries.
-                    if (nextMinTick == null || nextMaxTick == null || (visibleRange.min < nextMinTick || visibleRange.max > nextMaxTick))
-                        tickCache.Invalidate();
-                }
+                // actual regeneration only needs to occur if we've passed one of the known next min/max tick boundaries.
+                if (nextMinTick == null || nextMaxTick == null || (visibleRange.min < nextMinTick || visibleRange.max > nextMaxTick))
+                    tickCache.Invalidate();
             }
 
             if (!tickCache.IsValid)

From a9088d9231042d4dccee5a95a96551b66242224c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:11:36 +0900
Subject: [PATCH 571/709] Add assert/log output when too many ticks are being
 displayed

---
 .../Components/Timeline/TimelineTickDisplay.cs   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 9018c95a47..251306ee25 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -4,10 +4,12 @@
 #nullable disable
 
 using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -147,6 +149,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 }
             }
 
+            if (Children.Count > 512)
+            {
+                // There should always be a sanely small number of ticks rendered.
+                // If this assertion triggers, either the zoom logic is broken or a beatmap is
+                // probably doing weird things...
+                //
+                // Let's hope the latter never happens.
+                // If it does, we can choose to either fix it or ignore it as an outlier.
+                string message = $"Timeline is rendering many ticks ({Children.Count})";
+
+                Logger.Log(message);
+                Debug.Fail(message);
+            }
+
             int usedDrawables = drawableIndex;
 
             // save a few drawables beyond the currently used for edge cases.

From 0296685c74bbc47cebdc9d7c09b91bc10e10ff6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:25:24 +0900
Subject: [PATCH 572/709] Start key counter / gameplay leaderboard hidden to
 avoid initial fade out

---
 osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs | 3 +++
 osu.Game/Screens/Play/KeyCounterDisplay.cs           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 471aaf9a6d..53981b9edc 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -53,6 +53,9 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
             Scores.BindCollectionChanged((_, _) => Scheduler.AddOnce(showScores), true);
 
+            // Alpha will be updated via `updateVisibility` below.
+            Alpha = 0;
+
             AlwaysVisible.BindValueChanged(_ => updateVisibility());
             configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index b6094726c0..1b726b0f7b 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Play
             {
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,
+                Alpha = 0,
             };
         }
 

From c61f5403ab03378cce3013fa40f90714bd26083e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:32:30 +0900
Subject: [PATCH 573/709] Increase delay back slightly on notifications posting
 after disabled period

---
 osu.Game/Overlays/NotificationOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index fad8afd371..8e70f539a5 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Overlays
 
             if (enabled)
                 // we want a slight delay before toggling notifications on to avoid the user becoming overwhelmed.
-                notificationsEnabler = Scheduler.AddDelayed(() => processingPosts = true, State.Value == Visibility.Visible ? 0 : 100);
+                notificationsEnabler = Scheduler.AddDelayed(() => processingPosts = true, State.Value == Visibility.Visible ? 0 : 250);
             else
                 processingPosts = false;
         }

From 461ba64bfafa7c8a629f54e1c0fb4199a2a1790c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:32:53 +0900
Subject: [PATCH 574/709] Flush toast tray on entering a no-notification
 section

---
 osu.Game/Overlays/NotificationOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index 8e70f539a5..36548c893c 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -115,7 +115,10 @@ namespace osu.Game.Overlays
                 // we want a slight delay before toggling notifications on to avoid the user becoming overwhelmed.
                 notificationsEnabler = Scheduler.AddDelayed(() => processingPosts = true, State.Value == Visibility.Visible ? 0 : 250);
             else
+            {
                 processingPosts = false;
+                toastTray.FlushAllToasts();
+            }
         }
 
         protected override void LoadComplete()

From 8b722f88172c20ff806d00a645048b7e9babd25d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:41:55 +0900
Subject: [PATCH 575/709] Change default skin for new installations to "Argon"

Closes #20459.
---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 54c545e367..c1d87915ce 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Configuration
         {
             // UI/selection defaults
             SetDefault(OsuSetting.Ruleset, string.Empty);
-            SetDefault(OsuSetting.Skin, SkinInfo.TRIANGLES_SKIN.ToString());
+            SetDefault(OsuSetting.Skin, SkinInfo.ARGON_SKIN.ToString());
 
             SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
             SetDefault(OsuSetting.BeatmapDetailModsFilter, false);

From 3ece7205eda7ea1207375f2df4b38bb58918abcc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 17:52:29 +0900
Subject: [PATCH 576/709] Fix potential crash when losing network connectivity
 at online play screen

Addresses #20448.
---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 61ea7d68ee..7e5d90bd4f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -105,7 +105,8 @@ namespace osu.Game.Screens.OnlinePlay
                 while (this.IsCurrentScreen())
                     this.Exit();
             }
-            else
+            // Also handle the case where a child screen is current (ie. gameplay).
+            else if (this.GetChildScreen() != null)
             {
                 this.MakeCurrent();
                 Schedule(forcefullyExit);

From 58217b68396d00d16b50d6e454320c8795af25ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 20:09:21 +0900
Subject: [PATCH 577/709] Fix weird conditional

---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 251306ee25..c1c9b2493b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.Update();
 
-            if (timeline == null || !(DrawWidth > 0)) return;
+            if (timeline == null || DrawWidth <= 0) return;
 
             (float, float) newRange = (
                 (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,

From da8d94c4b46cf891eef362cb0085e8480998b629 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 27 Sep 2022 20:24:44 +0900
Subject: [PATCH 578/709] Fix test failures due to scheduled operations

---
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 15138b18b0..bbdfed0a00 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             private const float disabled_alpha = 0.2f;
 
+            public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
             public Action? SettingsApplied;
 
             public OsuTextBox NameField = null!;

From 1811647e34c7c663b1d94722a02a26cae38a06d5 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 27 Sep 2022 20:30:41 +0900
Subject: [PATCH 579/709] Make room requests handler handle GetBeatmapRequest

---
 .../Online/API/Requests/GetBeatmapRequest.cs  | 22 +++++----
 .../OnlinePlay/TestRoomRequestsHandler.cs     | 45 ++++++++++++-------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetBeatmapRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapRequest.cs
index efecc0fc25..3383d21dfc 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapRequest.cs
@@ -9,27 +9,25 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetBeatmapRequest : APIRequest<APIBeatmap>
     {
-        private readonly IBeatmapInfo beatmapInfo;
-
-        private readonly string filename;
+        public readonly IBeatmapInfo BeatmapInfo;
+        public readonly string Filename;
 
         public GetBeatmapRequest(IBeatmapInfo beatmapInfo)
         {
-            this.beatmapInfo = beatmapInfo;
-
-            filename = (beatmapInfo as BeatmapInfo)?.Path ?? string.Empty;
+            BeatmapInfo = beatmapInfo;
+            Filename = (beatmapInfo as BeatmapInfo)?.Path ?? string.Empty;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var request = base.CreateWebRequest();
 
-            if (beatmapInfo.OnlineID > 0)
-                request.AddParameter(@"id", beatmapInfo.OnlineID.ToString());
-            if (!string.IsNullOrEmpty(beatmapInfo.MD5Hash))
-                request.AddParameter(@"checksum", beatmapInfo.MD5Hash);
-            if (!string.IsNullOrEmpty(filename))
-                request.AddParameter(@"filename", filename);
+            if (BeatmapInfo.OnlineID > 0)
+                request.AddParameter(@"id", BeatmapInfo.OnlineID.ToString());
+            if (!string.IsNullOrEmpty(BeatmapInfo.MD5Hash))
+                request.AddParameter(@"checksum", BeatmapInfo.MD5Hash);
+            if (!string.IsNullOrEmpty(Filename))
+                request.AddParameter(@"filename", Filename);
 
             return request;
         }
diff --git a/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs b/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
index fa7ade2c07..ef4539ba56 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
@@ -135,25 +135,15 @@ namespace osu.Game.Tests.Visual.OnlinePlay
                     });
                     return true;
 
+                case GetBeatmapRequest getBeatmapRequest:
+                {
+                    getBeatmapRequest.TriggerSuccess(createResponseBeatmaps(getBeatmapRequest.BeatmapInfo.OnlineID).Single());
+                    return true;
+                }
+
                 case GetBeatmapsRequest getBeatmapsRequest:
                 {
-                    var result = new List<APIBeatmap>();
-
-                    foreach (int id in getBeatmapsRequest.BeatmapIds)
-                    {
-                        var baseBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == id);
-
-                        if (baseBeatmap == null)
-                        {
-                            baseBeatmap = new TestBeatmap(new RulesetInfo { OnlineID = 0 }).BeatmapInfo;
-                            baseBeatmap.OnlineID = id;
-                            baseBeatmap.BeatmapSet!.OnlineID = id;
-                        }
-
-                        result.Add(OsuTestScene.CreateAPIBeatmap(baseBeatmap));
-                    }
-
-                    getBeatmapsRequest.TriggerSuccess(new GetBeatmapsResponse { Beatmaps = result });
+                    getBeatmapsRequest.TriggerSuccess(new GetBeatmapsResponse { Beatmaps = createResponseBeatmaps(getBeatmapsRequest.BeatmapIds.ToArray()) });
                     return true;
                 }
 
@@ -175,6 +165,27 @@ namespace osu.Game.Tests.Visual.OnlinePlay
                 }
             }
 
+            List<APIBeatmap> createResponseBeatmaps(params int[] beatmapIds)
+            {
+                var result = new List<APIBeatmap>();
+
+                foreach (int id in beatmapIds)
+                {
+                    var baseBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == id);
+
+                    if (baseBeatmap == null)
+                    {
+                        baseBeatmap = new TestBeatmap(new RulesetInfo { OnlineID = 0 }).BeatmapInfo;
+                        baseBeatmap.OnlineID = id;
+                        baseBeatmap.BeatmapSet!.OnlineID = id;
+                    }
+
+                    result.Add(OsuTestScene.CreateAPIBeatmap(baseBeatmap));
+                }
+
+                return result;
+            }
+
             return false;
         }
 

From ed0752a5f12d29de2ec0e57e7cd9ae25ee0ef729 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 21:55:03 +0900
Subject: [PATCH 580/709] Update test assumptions

---
 osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
index 3757c49f18..010ed23c9b 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneEditDefaultSkin.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestEditDefaultSkin()
         {
-            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.TRIANGLES_SKIN);
+            AddAssert("is default skin", () => skinManager.CurrentSkinInfo.Value.ID == SkinInfo.ARGON_SKIN);
 
             AddStep("open settings", () => { Game.Settings.Show(); });
 
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("open skin editor", () => skinEditor.Show());
 
             // Until step required as the skin editor may take time to load (and an extra scheduled frame for the mutable part).
-            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.TRIANGLES_SKIN);
+            AddUntilStep("is modified default skin", () => skinManager.CurrentSkinInfo.Value.ID != SkinInfo.ARGON_SKIN);
             AddAssert("is not protected", () => skinManager.CurrentSkinInfo.Value.PerformRead(s => !s.Protected));
 
             AddUntilStep("export button enabled", () => Game.Settings.ChildrenOfType<SkinSection.ExportSkinButton>().SingleOrDefault()?.Enabled.Value == true);

From f3e25eacadc046c96669dab7e5f430b068d851ce Mon Sep 17 00:00:00 2001
From: o-dasher <88356162+o-dasher@users.noreply.github.com>
Date: Tue, 27 Sep 2022 09:25:58 -0400
Subject: [PATCH 581/709] Removes unnecessary setting sources specifications

---
 osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs   | 3 ---
 osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs      | 7 -------
 osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs   | 3 ---
 osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs          | 2 --
 osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs       | 2 --
 osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs             | 2 --
 osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs          | 7 -------
 osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs | 2 ++
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs   | 3 ---
 osu.Game/Rulesets/Mods/ModNoScope.cs                 | 7 +++++++
 osu.Game/Rulesets/Mods/ModWindDown.cs                | 4 ----
 osu.Game/Rulesets/Mods/ModWindUp.cs                  | 4 ----
 12 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index 41d4590aa8..1adc969f8f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +15,6 @@ namespace osu.Game.Rulesets.Catch.Mods
     {
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.12 : 1;
 
-        [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
         public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
@@ -24,7 +22,6 @@ namespace osu.Game.Rulesets.Catch.Mods
             Precision = 0.1f
         };
 
-        [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 350;
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs b/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
index 1b781b032c..19b4a39f97 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
@@ -6,8 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Game.Rulesets.Mods;
 using osu.Framework.Utils;
-using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.UI;
 
@@ -17,11 +15,6 @@ namespace osu.Game.Rulesets.Catch.Mods
     {
         public override LocalisableString Description => "Where's the catcher?";
 
-        [SettingSource(
-            "Hidden at combo",
-            "The combo count at which the catcher becomes completely hidden",
-            SettingControlType = typeof(SettingsSlider<int, HiddenComboSlider>)
-        )]
         public override BindableInt HiddenComboCount { get; } = new BindableInt(10)
         {
             MinValue = 0,
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
index 72ea1a2431..6eaede2112 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mods;
 using osuTK;
@@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
 
-        [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
         public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Mania.Mods
             Precision = 0.1f
         };
 
-        [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
         public override BindableBool ComboBasedSize { get; } = new BindableBool();
 
         public override float DefaultFlashlightSize => 50;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
index b2980f5311..f6622c268d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDeflate.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -18,7 +17,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override LocalisableString Description => "Hit them at the right size!";
 
-        [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat(2)
         {
             MinValue = 1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 7b34fe05a9..79f5eed139 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = default_follow_delay,
         };
 
-        [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
         public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
@@ -40,7 +39,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.1f
         };
 
-        [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 180;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
index b49257e289..3d066d3ada 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModGrow.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -18,7 +17,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override LocalisableString Description => "Hit them at the right size!";
 
-        [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
         public override BindableNumber<float> StartScale { get; } = new BindableFloat(0.5f)
         {
             MinValue = 0f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs b/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
index 84538cec30..2f84c30581 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModNoScope.cs
@@ -7,8 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Localisation;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.UI;
@@ -22,11 +20,6 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private PeriodTracker spinnerPeriods = null!;
 
-        [SettingSource(
-            "Hidden at combo",
-            "The combo count at which the cursor becomes completely hidden",
-            SettingControlType = typeof(SettingsSlider<int, HiddenComboSlider>)
-        )]
         public override BindableInt HiddenComboCount { get; } = new BindableInt(10)
         {
             MinValue = 0,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
index 59984f9a7b..6f1206382a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModObjectScaleTween.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
@@ -20,6 +21,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override double ScoreMultiplier => 1;
 
+        [SettingSource("Starting Size", "The initial size multiplier applied to all objects.")]
         public abstract BindableNumber<float> StartScale { get; }
 
         protected virtual float EndScale => 1;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index 05baf88a33..1caacdd1d7 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Layout;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
@@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override double ScoreMultiplier => UsesDefaultConfiguration ? 1.12 : 1;
 
-        [SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
         public override BindableFloat SizeMultiplier { get; } = new BindableFloat(1)
         {
             MinValue = 0.5f,
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
             Precision = 0.1f
         };
 
-        [SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
         public override float DefaultFlashlightSize => 250;
diff --git a/osu.Game/Rulesets/Mods/ModNoScope.cs b/osu.Game/Rulesets/Mods/ModNoScope.cs
index 1b9ce833ad..36fbb88943 100644
--- a/osu.Game/Rulesets/Mods/ModNoScope.cs
+++ b/osu.Game/Rulesets/Mods/ModNoScope.cs
@@ -6,7 +6,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -34,6 +36,11 @@ namespace osu.Game.Rulesets.Mods
 
         protected float ComboBasedAlpha;
 
+        [SettingSource(
+            "Hidden at combo",
+            "The combo count at which the cursor becomes completely hidden",
+            SettingControlType = typeof(SettingsSlider<int, HiddenComboSlider>)
+        )]
         public abstract BindableInt HiddenComboCount { get; }
 
         public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 15ee37d481..35a673093b 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Sloooow doooown...";
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
 
-        [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.51,
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble(0.75)
         {
             MinValue = 0.5,
@@ -33,7 +30,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public override BindableBool AdjustPitch { get; } = new BindableBool(true);
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 6d8838c5a5..bbc8382055 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Configuration;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -17,7 +16,6 @@ namespace osu.Game.Rulesets.Mods
         public override LocalisableString Description => "Can you keep up?";
         public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
 
-        [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble(1)
         {
             MinValue = 0.5,
@@ -25,7 +23,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble(1.5)
         {
             MinValue = 0.51,
@@ -33,7 +30,6 @@ namespace osu.Game.Rulesets.Mods
             Precision = 0.01,
         };
 
-        [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public override BindableBool AdjustPitch { get; } = new BindableBool(true);
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();

From 0cffbb756286971645105c3794afd03bca3e4122 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Tue, 27 Sep 2022 16:54:24 +0200
Subject: [PATCH 582/709] Clamp `LifetimeStart` of `HitObject`'s to their
 judgement windows

---
 .../Objects/Drawables/DrawableHoldNoteTail.cs               | 2 +-
 .../Objects/Drawables/DrawableSpinnerTick.cs                | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs               | 2 +-
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs    | 2 +-
 .../Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs    | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index a7bdcd047e..3084f71be2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public void UpdateResult() => base.UpdateResult(true);
 
-        protected override double MaximumJudgementOffset => base.MaximumJudgementOffset * release_window_lenience;
+        public override double MaximumJudgementOffset => base.MaximumJudgementOffset * release_window_lenience;
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
index 6a15463a32..4975ca1248 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
         }
 
-        protected override double MaximumJudgementOffset => DrawableSpinner.HitObject.Duration;
+        public override double MaximumJudgementOffset => DrawableSpinner.HitObject.Duration;
 
         /// <summary>
         /// Apply a judgement result.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 705a0a8047..451c5a793b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Filled = HitObject.FirstTick
             });
 
-        protected override double MaximumJudgementOffset => HitObject.HitWindow;
+        public override double MaximumJudgementOffset => HitObject.HitWindow;
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e218da918c..dec68a6c22 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -651,7 +651,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <remarks>
         /// This does not affect the time offset provided to invocations of <see cref="CheckForResult"/>.
         /// </remarks>
-        protected virtual double MaximumJudgementOffset => HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? 0;
+        public virtual double MaximumJudgementOffset => HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? 0;
 
         /// <summary>
         /// Applies the <see cref="Result"/> of this <see cref="DrawableHitObject"/>, notifying responders such as
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 0ed3ca1e63..d0aca4e7fc 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using osu.Framework.Allocation;
@@ -214,7 +215,10 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
+            double computedStartTime = scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
+
+            // always load the hitobject before its first judgement offset
+            return Math.Min(hitObject.HitObject.StartTime - hitObject.MaximumJudgementOffset, computedStartTime);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From eae8916e76ac0b0795565fd1d93cdb10a5136e2a Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Tue, 27 Sep 2022 19:52:55 +0200
Subject: [PATCH 583/709] Add test

---
 .../Judgements/TestSceneHitJudgements.cs      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
index a405f0e8ba..d2d5cdb6ac 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Judgements/TestSceneHitJudgements.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -129,5 +130,32 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
             AssertResult<Hit>(0, HitResult.Miss);
             AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
         }
+
+        [Test]
+        public void TestHighVelocityHit()
+        {
+            const double hit_time = 1000;
+
+            var beatmap = CreateBeatmap(new Hit
+            {
+                Type = HitType.Centre,
+                StartTime = hit_time,
+            });
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 6 });
+            beatmap.ControlPointInfo.Add(0, new EffectControlPoint { ScrollSpeed = 10 });
+
+            var hitWindows = new HitWindows();
+            hitWindows.SetDifficulty(beatmap.Difficulty.OverallDifficulty);
+
+            PerformTest(new List<ReplayFrame>
+            {
+                new TaikoReplayFrame(0),
+                new TaikoReplayFrame(hit_time - hitWindows.WindowFor(HitResult.Great), TaikoAction.LeftCentre),
+            }, beatmap);
+
+            AssertJudgementCount(1);
+            AssertResult<Hit>(0, HitResult.Ok);
+        }
     }
 }

From 8edb1cb98a45127c2c484001269f87ae2435b6f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Sep 2022 15:57:30 +0900
Subject: [PATCH 584/709] Add test coverage of current score staying on screen

---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs | 10 ++++++++++
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs    | 13 +++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 72656c29b1..171ae829a9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -58,6 +58,16 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for some scores not masked away",
                 () => leaderboard.ChildrenOfType<GameplayLeaderboardScore>().Any(s => leaderboard.ScreenSpaceDrawQuad.Contains(s.ScreenSpaceDrawQuad.Centre)));
+
+            AddUntilStep("wait for tracked score fully visible", () => leaderboard.ScreenSpaceDrawQuad.Intersects(leaderboard.TrackedScore!.ScreenSpaceDrawQuad));
+
+            AddStep("change score to middle", () => playerScore.Value = 1000000);
+            AddWaitStep("wait for movement", 5);
+            AddUntilStep("wait for tracked score fully visible", () => leaderboard.ScreenSpaceDrawQuad.Intersects(leaderboard.TrackedScore!.ScreenSpaceDrawQuad));
+
+            AddStep("change score to first", () => playerScore.Value = 5000000);
+            AddWaitStep("wait for movement", 5);
+            AddUntilStep("wait for tracked score fully visible", () => leaderboard.ScreenSpaceDrawQuad.Intersects(leaderboard.TrackedScore!.ScreenSpaceDrawQuad));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 2d816fbd55..e550c00390 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Play.HUD
         private bool requiresScroll;
         private readonly OsuScrollContainer scroll;
 
-        private GameplayLeaderboardScore? trackedScore;
+        public GameplayLeaderboardScore? TrackedScore { get; private set; }
 
         private const int max_panels = 8;
 
@@ -78,10 +78,10 @@ namespace osu.Game.Screens.Play.HUD
 
             if (isTracked)
             {
-                if (trackedScore != null)
+                if (TrackedScore != null)
                     throw new InvalidOperationException("Cannot track more than one score.");
 
-                trackedScore = drawable;
+                TrackedScore = drawable;
             }
 
             drawable.Expanded.BindTo(Expanded);
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Play.HUD
         public void Clear()
         {
             Flow.Clear();
-            trackedScore = null;
+            TrackedScore = null;
             scroll.ScrollToStart(false);
         }
 
@@ -119,9 +119,10 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Update();
 
-            if (requiresScroll && trackedScore != null)
+            if (requiresScroll && TrackedScore != null)
             {
-                float scrollTarget = scroll.GetChildPosInContent(trackedScore) + trackedScore.DrawHeight / 2 - scroll.DrawHeight / 2;
+                float scrollTarget = scroll.GetChildPosInContent(TrackedScore) + TrackedScore.DrawHeight / 2 - scroll.DrawHeight / 2;
+
                 scroll.ScrollTo(scrollTarget);
             }
 

From c8643ed2655afe7d4f7018bc767cc9bd385af5a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Sep 2022 15:34:35 +0900
Subject: [PATCH 585/709] Set `ClampExtension` to zero to stop jittering

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e550c00390..fde895a1ca 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 scroll = new InputDisabledScrollContainer
                 {
+                    ClampExtension = 0,
                     RelativeSizeAxes = Axes.Both,
                     Child = Flow = new FillFlowContainer<GameplayLeaderboardScore>
                     {
@@ -92,14 +93,6 @@ namespace osu.Game.Screens.Play.HUD
 
             int displayCount = Math.Min(Flow.Count, max_panels);
             Height = displayCount * (GameplayLeaderboardScore.PANEL_HEIGHT + Flow.Spacing.Y);
-            // Add extra margin space to flow equal to height of leaderboard.
-            // This ensures the content is always on screen, but also accounts for the fact that scroll operations
-            // without animation were actually forcing the local score to a location it can't usually reside at.
-            //
-            // Basically, the local score was in the scroll extension region (due to always trying to scroll the
-            // local player to the middle of the display, but there being no other content below the local player
-            // to scroll up by).
-            Flow.Margin = new MarginPadding { Bottom = Height };
             requiresScroll = displayCount != Flow.Count;
 
             return drawable;

From cdcc8494c9cc9e967e89b5fa06eef21bfaa97092 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Sep 2022 16:10:19 +0900
Subject: [PATCH 586/709] Fix fade being applied for too long when leaderboard
 scrolls to start

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 2d816fbd55..226cff9da1 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Play.HUD
             float fadeBottom = scroll.Current + scroll.DrawHeight;
             float fadeTop = scroll.Current + panel_height;
 
-            if (scroll.Current <= 0) fadeTop -= panel_height;
+            if (scroll.IsScrolledToStart()) fadeTop -= panel_height;
             if (!scroll.IsScrolledToEnd()) fadeBottom -= panel_height;
 
             // logic is mostly shared with Leaderboard, copied here for simplicity.

From 4ee435507d3f078a5507faacd002162db922cebe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Sep 2022 17:58:47 +0900
Subject: [PATCH 587/709] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index dd263d6aaa..c33937ad95 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.928.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c4e2a5168e..31b17fb8e1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 622efcd63d..a9a83e2802 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.928.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 2493468800a3bd2371d70fd8ad1aa03ec8903ebb Mon Sep 17 00:00:00 2001
From: nanashi-1 <bagaresalken@gmail.com>
Date: Sun, 2 Oct 2022 18:40:31 +0800
Subject: [PATCH 588/709] display highest combo instead of current combo

---
 osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
index 53981b9edc..ab3cf2950c 100644
--- a/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/SoloGameplayLeaderboard.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Play.HUD
 
             local.TotalScore.BindTarget = scoreProcessor.TotalScore;
             local.Accuracy.BindTarget = scoreProcessor.Accuracy;
-            local.Combo.BindTarget = scoreProcessor.Combo;
+            local.Combo.BindTarget = scoreProcessor.HighestCombo;
 
             // Local score should always show lower than any existing scores in cases of ties.
             local.DisplayOrder.Value = long.MaxValue;

From b6701dd57892f4f585adb1494388768538fb69cc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 Oct 2022 15:29:53 +0300
Subject: [PATCH 589/709] Add failing test case

---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index e2c825df0b..a26a7e97be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected new OutroPlayer Player => (OutroPlayer)base.Player;
 
+        private double currentBeatmapDuration;
         private double currentStoryboardDuration;
 
         private bool showResults = true;
@@ -45,7 +46,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
             AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
             AddStep("reset fail conditions", () => currentFailConditions = (_, _) => false);
-            AddStep("set storyboard duration to 2s", () => currentStoryboardDuration = 2000);
+            AddStep("set beatmap duration to 0s", () => currentBeatmapDuration = 0);
+            AddStep("set storyboard duration to 8s", () => currentStoryboardDuration = 8000);
             AddStep("set ShowResults = true", () => showResults = true);
         }
 
@@ -151,6 +153,24 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("player exited", () => Stack.CurrentScreen == null);
         }
 
+        [Test]
+        public void TestPerformExitAfterOutro()
+        {
+            CreateTest(() =>
+            {
+                AddStep("set beatmap duration to 4s", () => currentBeatmapDuration = 4000);
+                AddStep("set storyboard duration to 1s", () => currentStoryboardDuration = 1000);
+            });
+
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
+            AddStep("exit via pause", () => Player.ExitViaPause());
+            AddAssert("player paused", () => !Player.IsResuming);
+
+            AddStep("resume player", () => Player.Resume());
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
+        }
+
         protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
@@ -160,7 +180,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap();
-            beatmap.HitObjects.Add(new HitCircle());
+            beatmap.HitObjects.Add(new HitCircle { StartTime = currentBeatmapDuration });
             return beatmap;
         }
 
@@ -189,7 +209,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private event Func<HealthProcessor, JudgementResult, bool> failConditions;
 
             public OutroPlayer(Func<HealthProcessor, JudgementResult, bool> failConditions, bool showResults = true)
-                : base(false, showResults)
+                : base(showResults: showResults)
             {
                 this.failConditions = failConditions;
             }

From 59728b0ccb78fc7394cc15016cfe1c55fa45884b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 Oct 2022 15:30:06 +0300
Subject: [PATCH 590/709] Fix results display delegate potentially cancelled
 while not exiting

---
 osu.Game/Screens/Play/Player.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e31e18046e..9bc784411a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -566,9 +566,6 @@ namespace osu.Game.Screens.Play
         /// </param>
         protected void PerformExit(bool showDialogFirst)
         {
-            // if an exit has been requested, cancel any pending completion (the user has shown intention to exit).
-            resultsDisplayDelegate?.Cancel();
-
             // there is a chance that an exit request occurs after the transition to results has already started.
             // even in such a case, the user has shown intent, so forcefully return to this screen (to proceed with the upwards exit process).
             if (!this.IsCurrentScreen())
@@ -603,6 +600,9 @@ namespace osu.Game.Screens.Play
                 }
             }
 
+            // if an exit has been requested, cancel any pending completion (the user has shown intention to exit).
+            resultsDisplayDelegate?.Cancel();
+
             // The actual exit is performed if
             // - the pause / fail dialog was not requested
             // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).

From a810afafb39752affe1e8f59deef4afc36ed095e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 Oct 2022 15:37:56 +0300
Subject: [PATCH 591/709] Reschedule results display delegate to avoid
 potential softlocks in the future

---
 osu.Game/Screens/Play/Player.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9bc784411a..7721d5b912 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -780,19 +780,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <remarks>
         /// A final display will only occur once all work is completed in <see cref="PrepareScoreForResultsAsync"/>. This means that even after calling this method, the results screen will never be shown until <see cref="JudgementProcessor.HasCompleted">ScoreProcessor.HasCompleted</see> becomes <see langword="true"/>.
-        ///
-        /// Calling this method multiple times will have no effect.
         /// </remarks>
         /// <param name="withDelay">Whether a minimum delay (<see cref="RESULTS_DISPLAY_DELAY"/>) should be added before the screen is displayed.</param>
         private void progressToResults(bool withDelay)
         {
-            if (resultsDisplayDelegate != null)
-                // Note that if progressToResults is called one withDelay=true and then withDelay=false, this no-delay timing will not be
-                // accounted for. shouldn't be a huge concern (a user pressing the skip button after a results progression has already been queued
-                // may take x00 more milliseconds than expected in the very rare edge case).
-                //
-                // If required we can handle this more correctly by rescheduling here.
-                return;
+            resultsDisplayDelegate?.Cancel();
 
             double delay = withDelay ? RESULTS_DISPLAY_DELAY : 0;
 

From 492f26c8328a4562b249911cd2810be2d3f99f28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 16:56:32 +0900
Subject: [PATCH 592/709] Update test step in line with new combo source

---
 .../Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index 6b52e934b7..c852685b74 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddSliderStep("score", 0, 1000000, 500000, v => scoreProcessor.TotalScore.Value = v);
             AddSliderStep("accuracy", 0f, 1f, 0.5f, v => scoreProcessor.Accuracy.Value = v);
-            AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.Combo.Value = v);
+            AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.HighestCombo.Value = v);
         }
 
         [Test]

From c4dd23ed15c2818f9aab44361e0f1981e57ad901 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 17:22:30 +0900
Subject: [PATCH 593/709] Log token retrieval failures even when gameplay is
 allowed to continue

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index be77304076..85d1ecea6b 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -76,6 +76,7 @@ namespace osu.Game.Screens.Play
 
             req.Success += r =>
             {
+                Logger.Log($"Score submission token retrieved ({r.ID})");
                 token = r.ID;
                 tcs.SetResult(true);
             };
@@ -104,6 +105,12 @@ namespace osu.Game.Screens.Play
                         this.Exit();
                     });
                 }
+                else
+                {
+                    // Gameplay is allowed to continue, but we still should keep track of the error.
+                    // In the future, this should be visible to the user in some way.
+                    Logger.Log($"Score submission token retrieval failed ({exception.Message})");
+                }
 
                 tcs.SetResult(false);
             }

From 65369e96ebf1ee90e5a74dba974a79824b8e54f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 17:29:46 +0900
Subject: [PATCH 594/709] Ensure token retrieval failure logic only runs once

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 85d1ecea6b..d56b9c23c8 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -92,6 +92,11 @@ namespace osu.Game.Screens.Play
 
             void handleTokenFailure(Exception exception)
             {
+                // This method may be invoked multiple times due to the Task.Wait call above.
+                // We only really care about the first error.
+                if (!tcs.TrySetResult(false))
+                    return;
+
                 if (HandleTokenRetrievalFailure(exception))
                 {
                     if (string.IsNullOrEmpty(exception.Message))
@@ -111,8 +116,6 @@ namespace osu.Game.Screens.Play
                     // In the future, this should be visible to the user in some way.
                     Logger.Log($"Score submission token retrieval failed ({exception.Message})");
                 }
-
-                tcs.SetResult(false);
             }
         }
 

From 42aac16b377b7b8ab52fba8107a84a5d13fa87c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 18:12:36 +0900
Subject: [PATCH 595/709] Adjust leaderboard score panels sizing based on
 accuracy/combo width

---
 .../TestSceneSoloGameplayLeaderboard.cs       |  3 +-
 .../Play/HUD/GameplayLeaderboardScore.cs      | 44 +++++++++++++++----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
index c852685b74..60ed0012ae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSoloGameplayLeaderboard.cs
@@ -66,7 +66,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddSliderStep("score", 0, 1000000, 500000, v => scoreProcessor.TotalScore.Value = v);
             AddSliderStep("accuracy", 0f, 1f, 0.5f, v => scoreProcessor.Accuracy.Value = v);
-            AddSliderStep("combo", 0, 1000, 0, v => scoreProcessor.HighestCombo.Value = v);
+            AddSliderStep("combo", 0, 10000, 0, v => scoreProcessor.HighestCombo.Value = v);
+            AddStep("toggle expanded", () => leaderboard.Expanded.Value = !leaderboard.Expanded.Value);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 29354e610d..548dd2a5bb 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -39,8 +40,6 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float rank_text_width = 35f;
 
-        private const float score_components_width = 85f;
-
         private const float avatar_size = 25f;
 
         private const double panel_transition_duration = 500;
@@ -161,7 +160,7 @@ namespace osu.Game.Screens.Play.HUD
                             {
                                 new Dimension(GridSizeMode.Absolute, rank_text_width),
                                 new Dimension(),
-                                new Dimension(GridSizeMode.AutoSize, maxSize: score_components_width),
+                                new Dimension(GridSizeMode.AutoSize),
                             },
                             Content = new[]
                             {
@@ -286,8 +285,19 @@ namespace osu.Game.Screens.Play.HUD
             LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
 
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
-            Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
-            Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
+
+            Accuracy.BindValueChanged(v =>
+            {
+                accuracyText.Text = v.NewValue.FormatAccuracy();
+                updateDetailsWidth();
+            }, true);
+
+            Combo.BindValueChanged(v =>
+            {
+                comboText.Text = $"{v.NewValue}x";
+                updateDetailsWidth();
+            }, true);
+
             HasQuit.BindValueChanged(_ => updateState());
         }
 
@@ -303,13 +313,10 @@ namespace osu.Game.Screens.Play.HUD
 
         private void changeExpandedState(ValueChangedEvent<bool> expanded)
         {
-            scoreComponents.ClearTransforms();
-
             if (expanded.NewValue)
             {
                 gridContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutQuint);
 
-                scoreComponents.ResizeWidthTo(score_components_width, panel_transition_duration, Easing.OutQuint);
                 scoreComponents.FadeIn(panel_transition_duration, Easing.OutQuint);
 
                 usernameText.FadeIn(panel_transition_duration, Easing.OutQuint);
@@ -318,13 +325,32 @@ namespace osu.Game.Screens.Play.HUD
             {
                 gridContainer.ResizeWidthTo(compact_width, panel_transition_duration, Easing.OutQuint);
 
-                scoreComponents.ResizeWidthTo(0, panel_transition_duration, Easing.OutQuint);
                 scoreComponents.FadeOut(text_transition_duration, Easing.OutQuint);
 
                 usernameText.FadeOut(text_transition_duration, Easing.OutQuint);
             }
+
+            updateDetailsWidth();
         }
 
+        private float? scoreComponentsTargetWidth;
+
+        // Schedule required to get correct DrawWidth from text after updates.
+        private void updateDetailsWidth() => SchedulerAfterChildren.AddOnce(() =>
+        {
+            const float score_components_min_width = 88f;
+
+            float newWidth = Expanded.Value
+                ? Math.Max(score_components_min_width, comboText.DrawWidth + accuracyText.DrawWidth + 25)
+                : 0;
+
+            if (scoreComponentsTargetWidth == newWidth)
+                return;
+
+            scoreComponentsTargetWidth = newWidth;
+            scoreComponents.ResizeWidthTo(newWidth, panel_transition_duration, Easing.OutQuint);
+        });
+
         private void updateState()
         {
             bool widthExtension = false;

From d9f678d94220e8a3adefc9e058a521263d0fca9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 18:16:54 +0900
Subject: [PATCH 596/709] Change song select random key binding to not handle
 key repeat

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 1f56915f62..aad7fdff39 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -138,7 +138,8 @@ namespace osu.Game.Screens.Select
                 return false;
             }
 
-            TriggerClick();
+            if (!e.Repeat)
+                TriggerClick();
             return true;
         }
 

From 0df217d85caf46e9dfaf1d9d9126b541a8a95034 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 3 Oct 2022 18:24:56 +0900
Subject: [PATCH 597/709] Add ability to adjust flashlight smoothness

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 6d7706cde2..7ed73b3163 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -201,6 +201,20 @@ namespace osu.Game.Rulesets.Mods
                 }
             }
 
+            private float flashlightSmoothness = 1.1f;
+
+            public float FlashlightSmoothness
+            {
+                get => flashlightSmoothness;
+                set
+                {
+                    if (flashlightSmoothness == value) return;
+
+                    flashlightSmoothness = value;
+                    Invalidate(Invalidation.DrawNode);
+                }
+            }
+
             private class FlashlightDrawNode : DrawNode
             {
                 protected new Flashlight Source => (Flashlight)base.Source;
@@ -210,6 +224,7 @@ namespace osu.Game.Rulesets.Mods
                 private Vector2 flashlightPosition;
                 private Vector2 flashlightSize;
                 private float flashlightDim;
+                private float flashlightSmoothness;
 
                 private IVertexBatch<PositionAndColourVertex>? quadBatch;
                 private Action<TexturedVertex2D>? addAction;
@@ -228,6 +243,7 @@ namespace osu.Game.Rulesets.Mods
                     flashlightPosition = Vector2Extensions.Transform(Source.FlashlightPosition, DrawInfo.Matrix);
                     flashlightSize = Source.FlashlightSize * DrawInfo.Matrix.ExtractScale().Xy;
                     flashlightDim = Source.FlashlightDim;
+                    flashlightSmoothness = Source.flashlightSmoothness;
                 }
 
                 public override void Draw(IRenderer renderer)
@@ -249,6 +265,7 @@ namespace osu.Game.Rulesets.Mods
                     shader.GetUniform<Vector2>("flashlightPos").UpdateValue(ref flashlightPosition);
                     shader.GetUniform<Vector2>("flashlightSize").UpdateValue(ref flashlightSize);
                     shader.GetUniform<float>("flashlightDim").UpdateValue(ref flashlightDim);
+                    shader.GetUniform<float>("flashlightSmoothness").UpdateValue(ref flashlightSmoothness);
 
                     renderer.DrawQuad(renderer.WhitePixel, screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: addAction);
 

From 8598eb29f8393106b1dbea30c9b1b8fbdddd3418 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 3 Oct 2022 18:26:35 +0900
Subject: [PATCH 598/709] Adjust flashlight to closely match classic

---
 osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 79f5eed139..66f367c79b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
-        public override float DefaultFlashlightSize => 180;
+        public override float DefaultFlashlightSize => 200;
 
         private OsuFlashlight flashlight = null!;
 
@@ -63,6 +63,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 followDelay = modFlashlight.FollowDelay.Value;
 
                 FlashlightSize = new Vector2(0, GetSizeFor(0));
+                FlashlightSmoothness = 1.4f;
             }
 
             public void OnSliderTrackingChange(ValueChangedEvent<bool> e)

From deae7cff60efdf4e58bbdcae9c7121565d575d2a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 3 Oct 2022 18:38:29 +0900
Subject: [PATCH 599/709] Adjust flashliht scaling to match classic

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index 7ed73b3163..a594363d4c 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -151,9 +151,9 @@ namespace osu.Game.Rulesets.Mods
                 if (comboBasedSize)
                 {
                     if (combo >= 200)
-                        size *= 0.8f;
+                        size *= 0.625f;
                     else if (combo >= 100)
-                        size *= 0.9f;
+                        size *= 0.8125f;
                 }
 
                 return size;

From 13ee5c179ea2dd338b3f9ef0001b4bb8a8941b90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 18:42:40 +0900
Subject: [PATCH 600/709] Add missing parenthesis in log message

---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 59c0af1533..8a42fef43d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -563,7 +563,7 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
-                Logger.Log($"{nameof(PresentScore)} updating beatmap ({databasedBeatmap}) and ruleset ({databasedScore.ScoreInfo.Ruleset} to match score");
+                Logger.Log($"{nameof(PresentScore)} updating beatmap ({databasedBeatmap}) and ruleset ({databasedScore.ScoreInfo.Ruleset} to match score)");
 
                 Ruleset.Value = databasedScore.ScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);

From 7fbbe88c8ea945dfd8aa4b51091c354074e2a2d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 20:24:09 +0900
Subject: [PATCH 601/709] Add test coverage of song select score presentation
 failures

---
 .../Navigation/TestScenePresentScore.cs       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
index 5e76fe1519..003cec0d07 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
@@ -9,8 +9,10 @@ using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
@@ -92,6 +94,31 @@ namespace osu.Game.Tests.Visual.Navigation
             returnToMenu();
         }
 
+        [Test]
+        public void TestFromSongSelectWithFilter([Values] ScorePresentType type)
+        {
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
+
+            AddStep("filter to nothing", () => ((PlaySongSelect)Game.ScreenStack.CurrentScreen).FilterControl.CurrentTextSearch.Value = "fdsajkl;fgewq");
+            AddUntilStep("wait for no results", () => Beatmap.IsDefault);
+
+            var firstImport = importScore(1, new CatchRuleset().RulesetInfo);
+            presentAndConfirm(firstImport, type);
+        }
+
+        [Test]
+        public void TestFromSongSelectWithConvertRulesetChange([Values] ScorePresentType type)
+        {
+            AddStep("enter song select", () => Game.ChildrenOfType<ButtonSystem>().Single().OnSolo.Invoke());
+            AddUntilStep("song select is current", () => Game.ScreenStack.CurrentScreen is PlaySongSelect songSelect && songSelect.BeatmapSetsLoaded);
+
+            AddStep("set convert to false", () => Game.LocalConfig.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
+
+            var firstImport = importScore(1, new CatchRuleset().RulesetInfo);
+            presentAndConfirm(firstImport, type);
+        }
+
         [Test]
         public void TestFromSongSelect([Values] ScorePresentType type)
         {

From 332d63b53bee3d5ea18a4e7853aee834674d5039 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 20:04:37 +0900
Subject: [PATCH 602/709] Always return to main menu before attempting to
 present a score from import

---
 osu.Game/OsuGame.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 8a42fef43d..6359ed3e27 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -561,6 +561,8 @@ namespace osu.Game
                 return;
             }
 
+            // This should be able to be performed from song select, but that is disabled for now
+            // due to the weird decoupled ruleset logic (which can cause a crash in certain filter scenarios).
             PerformFromScreen(screen =>
             {
                 Logger.Log($"{nameof(PresentScore)} updating beatmap ({databasedBeatmap}) and ruleset ({databasedScore.ScoreInfo.Ruleset} to match score)");
@@ -578,7 +580,7 @@ namespace osu.Game
                         screen.Push(new SoloResultsScreen(databasedScore.ScoreInfo, false));
                         break;
                 }
-            }, validScreens: new[] { typeof(PlaySongSelect) });
+            });
         }
 
         public override Task Import(params ImportTask[] imports)

From dfb143ec0bb1483c61b8a7d72812b535ba241466 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Oct 2022 21:14:57 +0900
Subject: [PATCH 603/709] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index dd263d6aaa..102d368095 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.922.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c4e2a5168e..9cc4f3fbab 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 622efcd63d..cc922d304f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
   <PropertyGroup>

From 929eb8559e9101e1ce1ba6a2249d15c9531d17d0 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 3 Oct 2022 16:02:33 -0700
Subject: [PATCH 604/709] Fix `LegacySmoke` alpha calculations

---
 .../Skinning/Legacy/LegacySmoke.cs            | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index f02c20fefb..b8d70c1c6d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -67,6 +67,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             protected new LegacySmoke Source => (LegacySmoke)base.Source;
 
             private double initialFadeOutDurationTrunc;
+            private double firstVisiblePointTime;
+
             private double initialFadeOutTime;
             private double reFadeInTime;
             private double finalFadeOutTime;
@@ -83,20 +85,22 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 base.ApplyState();
 
-                initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
                 rotationSeed = Source.RotationSeed;
-
                 rotationRNG = new Random(rotationSeed);
-                initialFadeOutTime = Math.Min(CurrentTime, SmokeEndTime);
-                reFadeInTime = re_fade_in_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc;
-                finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
+
+                initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+                firstVisiblePointTime = SmokeEndTime - initialFadeOutDurationTrunc;
+
+                initialFadeOutTime = CurrentTime;
+                reFadeInTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / re_fade_in_speed);
+                finalFadeOutTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / final_fade_out_speed);
             }
 
             protected override Color4 PointColour(SmokePoint point)
             {
                 var color = Color4.White;
 
-                double timeDoingInitialFadeOut = initialFadeOutTime - point.Time;
+                double timeDoingInitialFadeOut = Math.Min(initialFadeOutTime, SmokeEndTime) - point.Time;
 
                 if (timeDoingInitialFadeOut > 0)
                 {
@@ -106,8 +110,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                 if (color.A > 0)
                 {
-                    double timeDoingReFadeIn = reFadeInTime - point.Time;
-                    double timeDoingFinalFadeOut = finalFadeOutTime - point.Time;
+                    double timeDoingReFadeIn = reFadeInTime - point.Time / re_fade_in_speed;
+                    double timeDoingFinalFadeOut = finalFadeOutTime - point.Time / final_fade_out_speed;
 
                     if (timeDoingFinalFadeOut > 0)
                     {

From c1da3bc9cf831b35f368bb54c64e84bdede47339 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 3 Oct 2022 16:03:37 -0700
Subject: [PATCH 605/709] Remove skinnable parents at the same time as their
 smoke children

---
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 2b5bddf959..f8551e46e9 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -44,6 +45,9 @@ namespace osu.Game.Rulesets.Osu.UI
             {
                 isSmoking = false;
                 SmokeEnded?.Invoke(Time.Current);
+
+                foreach (SkinnableDrawable skinnable in Children)
+                    skinnable.LifetimeEnd = skinnable.Drawable.LifetimeEnd;
             }
         }
 

From 343bdaa98efbc457ba5383fe4c488c0ba1297f7a Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 3 Oct 2022 16:07:39 -0700
Subject: [PATCH 606/709] Remove unnecessary `IsActive` variable

---
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index 4d2a193a8a..fae875eedb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         protected double SmokeEndTime { get; private set; } = double.MaxValue;
 
         protected virtual float PointInterval => Radius * 7f / 8;
-        protected bool IsActive { get; private set; }
 
         protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
 
@@ -73,7 +72,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 smokeContainer.SmokeMoved += onSmokeMoved;
                 smokeContainer.SmokeEnded += onSmokeEnded;
-                IsActive = true;
 
                 onSmokeMoved(smokeContainer.LastMousePosition, Time.Current);
             }
@@ -87,9 +85,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void onSmokeMoved(Vector2 position, double time)
         {
-            if (!IsActive)
-                return;
-
             lastPosition ??= position;
 
             float delta = (position - (Vector2)lastPosition).LengthFast;
@@ -137,10 +132,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private void onSmokeEnded(double time)
         {
-            if (!IsActive)
-                return;
+            if (smokeContainer != null)
+            {
+                smokeContainer.SmokeMoved -= onSmokeMoved;
+                smokeContainer.SmokeEnded -= onSmokeEnded;
+            }
 
-            IsActive = false;
             SmokeEndTime = time;
         }
 

From ccef189b81569aa25b0d2ce26c03039be9a7aeea Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 3 Oct 2022 18:19:05 -0700
Subject: [PATCH 607/709] Add barebones test for smoke

---
 .../metrics-skin/cursor-smoke@2x.png          | Bin 0 -> 251 bytes
 .../Resources/old-skin/cursor-smoke.png       | Bin 0 -> 2249 bytes
 osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs |  97 ++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    |   4 +-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/cursor-smoke@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor-smoke.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/cursor-smoke@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/cursor-smoke@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1380a47a47f4e1b293237f24f54606600a72964
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85p>QL70(Y)*K0--~>+>$B>G+x3d-b7z}wDZvFm0znsl}FGJhS
zNhUL2p0i9pQWN3LxM3Pof-dWUsCWMx?mqphHvMN5<C>)mND^EPTSXYMH5sl2F_0v2
ik^M!U07BoXGyGz#Jf&%6Kd%7Y#^CAd=d#Wzp$PzN-cP*%

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor-smoke.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor-smoke.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f7beae4e9dddd9493c3353ae209ea8c5679ca9c
GIT binary patch
literal 2249
zcmaJ@dstFw8b=WE5?-g&a_UIUrk21_P#{rJyk$6wkeA0z2~L6v2f2unsYJGBUdqyL
zZaHPsWz*WG)y%Z1p3K=*9L+4Z)~skMt(nrwQmZ|fHS@>1=Xt*Ko%efw@9+J+m+yJb
zw%C{my!AqB6bglpiez(<9WX6R3*@cTYF{CnnUWh3f@(ClJw*)jbQXt&LjAqcW?Fzn
zY%6(Wk`jfoy=q!!*Wu$L6bcg{;U%gPIcpd~SV|O#;PntOS1L!)C{#dDu3R9@gjB$K
zC|x3B5`JsFL;xfrCLw{!A#>!RkXRC_RY39D7@km@DWr=CL4kPdfLsQ`Aca%{AXl0t
zQ!;Xygc)K6@@+aM5r7$pDw9cInIZy-oLC?fRzLuiNc9$yeL%pUP6VkGItZ==e8`|L
z2_%zz=-wd6p!hRDKVbGDAmIQYKq1<|;IhMK!yy)vAXcg53=&DB(GWGhL|Bnd0_k)*
ziR?r2@$p6w-pV|gN|5U<Q!f2PGE2jTltP6>u9Cnqz(gxp535y70;2d+DpL6uZkckn
zUP$FgxdJ%}B$7?3eFkzk{~s!qenBf$T<CYv|C3nB%acPSE~JFj3L%8RmzqM!8KDYD
zpn?@V7|!}!%~&z4f|X)e4upmR9tjee2-YY)XW$$TBTA-J31mVjip?Y-1Vo8M#PAOd
z52u23zmTvnKM)M_rG?RHVg4)@C6w$-_NV)Q_GQCDwG@)6KKqJ(_w}FCccw?Ch6Nzu
z5CLpRA<2P6;R;v^%p}f`%q@vBC+)1SXl_Z=xqV5qq5?>!CjX)7p9X5?6qzW*3Lt$M
zXOs2iN<cE?9w?B3Z!kuGK%uY;qS!26V#Hr>B~|kI_SoTe&JDmzk1_NDjuE@XWxeb?
zFd!}ejosVpZ!wOG%i;a@)pZ^2;KFNGm#rMCzmqhM-f0`vPNH*CS0uId48}Jk^EV#4
zbEL&{QRVf?1qnmH5V7M&dc}E<)IRO@DYib83svpK=Z4ao-VOPU9)K;Ink#6Qzr1!H
zlU;NeF|@(IKJVIaRng^#jlPW6wQo18a?{@8Mx5h$d~?dxt~&WN6?;~G%8GrNj_tfe
zzwLB)zDuhk0R7rHd~~=bO?ZZ?11P)r#_qGa@+RzKv~VM4S)r{x&7ow#<*+}l(4xeB
zEaFA8=4n*x_YEg?F7!gXNQwT^<~vhUu-Q>so9AuEC-)qlJ-fXy7M{{(t`DiZrPDlb
zFhi%R@4BQ|(l!O0U*%E73*|=RS+U=hHVwYW6FZ^XY_r6AUo+gn*V|V2A8w}KT@v8p
zkurWi9|#-BKJQuKj4r6%ExDGkg6t7qy{_!hWJ^(f-x13tmiC8N(+gJy?{JNGvcqZ2
zOLv{d-&jpSw<*ErWSHM;J=*r;iMo!{W-ZK*Uy&UOU1RlL6Xu&)dy~;VhfZ>RU-}As
z(>BB|69p~uAhtB`EBAPzts@3n_m>2ECE||hQ#W(F8BbaL>q-umKZx#@)W)NQHl68a
zxy`}7aX(J4((BE(1=$A9Ta2&3s=@4>i$VTs%+s+hdTNK^C#%QHZkCoZU7y*o?>lPi
zA5PWP=NJp-wc~5iiwJ9|p5%$9q91BTT>3hriu=npiH+f^t`5I<E8h}!{1&g<-ia+P
z6N*F6xVPN1rLix>psAfC%lf?w;xd4yM9-hOI$o_@jD9zP8yOxP78RZ8ykxTuA6Z`3
zpZKu=fQZDnb|)82D`BnS&*RSfDf(5YomKO0Fs%G00r|oqOZGIUsPl&I%F-1Nddy|9
zna9WSfp7Z5iumR4H~y*Bny=y=ACC#ylAnJU_ZN(zYw+vii;Ny6!C&9nqYu>;>{;+S
zKe~(>J^U|@PF8KPNa5vmK!-1Q66<6<w=;TmcHmbfi2|=QR%H1q^Q7JjySs216he7$
z<<K(yf~zZ7^B23O+NAiX`*-kpmJF*t_mC5D?>iL_3gqlc3$^o$oB7Q_Z5BoxuMy2~
zJTJ;Jz8^)oPHd@NtEFky8}B4b>K3O@Sd`-3i+=*qk>i7kb=Ihsz0*@?-6IF4&}`m?
z50l-&o)!5_=`^p<59f;AM&q7L%^u5c!L^NTBzY%+kAB{o9QT%5|FJvxoZ4T$W~2wx
ze1EwPf3xz5@sO|5E4gCR%Y|ci%f`7y@eQnh3|Bey9@Aa3?snU=TSKiw(QigL^bADr
zqh|zXbCb32x%+A9epyueL{wzw4>e`=yMmhCup`U&jwTGfKJmsGvuA#KUz%M@!prGX
zr58_m#tu~PxaYiCgGps`OV{qtFJS&{JH{*>#`YZ!Jf)%9Y<X3Z@tSlxs;Jn!$u04C
zAD<W%jel5x<Dys*J;hth!|W*uaZO8(p<8Q|Io{|=_V@gvgVNQmkK2jP4@&}j?;X8z
zzJT4}q;8crrZ-q@9oUyFijSjJ#cU-wB}HYXFiVmR^y2aVoH+94kYSK-J+I*y#;vuc
z^xqU=#+8J=Y_*|BHRe00wpw%aO2_m1S064^lrKHcGwfXVtr1E%n)c6(6mVzl30#6=
xs*;AB53V%aqV&EgSw1l37c=oO=)i#~T$bHO`oU}8Hkke=qQYX>jUj29{|g{XbHV@s

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
new file mode 100644
index 0000000000..ce1cab3b9b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
@@ -0,0 +1,97 @@
+// 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.Graphics;
+using osu.Framework.Input.Events;
+using osu.Framework.Input.States;
+using osu.Framework.Testing.Input;
+using osu.Game.Rulesets.Osu.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneSmoke : OsuSkinnableTestScene
+    {
+        [Test]
+        public void TestSmoking()
+        {
+            AddStep("Create smoke", () =>
+            {
+                SetContents(_ =>
+                {
+                    return new SmokingInputManager
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(0.95f),
+                        Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
+                    };
+                });
+            });
+        }
+
+        private const double spin_duration = 5_000;
+        private const float spin_angle = 4 * MathF.PI;
+
+        private class SmokingInputManager : ManualInputManager
+        {
+            private double? startTime;
+
+            public SmokingInputManager()
+            {
+                UseParentInput = false;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                MoveMouseTo(ToScreenSpace(DrawSize / 2));
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                startTime ??= Time.Current;
+
+                float fraction = (float)((Time.Current - startTime) / spin_duration);
+
+                float angle = fraction * spin_angle;
+                float radius = fraction * Math.Min(DrawSize.X, DrawSize.Y) / 2;
+
+                Vector2 pos = radius * new Vector2(MathF.Cos(angle), MathF.Sin(angle)) + DrawSize / 2;
+                MoveMouseTo(ToScreenSpace(pos));
+            }
+        }
+
+        private class TestSmokeContainer : SmokeContainer
+        {
+            private double? startTime;
+            private bool isPressing;
+            private bool isFinished;
+
+            protected override void Update()
+            {
+                base.Update();
+
+                startTime ??= Time.Current;
+
+                if (!isPressing && !isFinished && Time.Current > startTime + 0.1)
+                {
+                    OnPressed(new KeyBindingPressEvent<OsuAction>(new InputState(), OsuAction.Smoke));
+                    isPressing = true;
+                    isFinished = false;
+                }
+
+                if (isPressing && Time.Current > startTime + spin_duration)
+                {
+                    OnReleased(new KeyBindingReleaseEvent<OsuAction>(new InputState(), OsuAction.Smoke));
+                    isPressing = false;
+                    isFinished = true;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index f8551e46e9..449dd920d6 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Rulesets.Osu.Skinning;
+using osu.Framework.Logging;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
+                Logger.Log("holy moly");
+
                 isSmoking = true;
                 AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.Smoke), _ => new DefaultSmoke()));
 

From eaab0deef32f037a2de634c8eb0406d95cc601c8 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Mon, 3 Oct 2022 19:20:51 -0700
Subject: [PATCH 608/709] Fix InspectCode issues

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs | 11 ++++-------
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    |  6 +++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
index ce1cab3b9b..82417d09a7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
@@ -19,14 +19,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("Create smoke", () =>
             {
-                SetContents(_ =>
+                SetContents(_ => new SmokingInputManager
                 {
-                    return new SmokingInputManager
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Size = new Vector2(0.95f),
-                        Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
-                    };
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.95f),
+                    Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
                 });
             });
         }
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 449dd920d6..e139e16ff2 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -48,8 +49,11 @@ namespace osu.Game.Rulesets.Osu.UI
                 isSmoking = false;
                 SmokeEnded?.Invoke(Time.Current);
 
-                foreach (SkinnableDrawable skinnable in Children)
+                foreach (Drawable child in Children)
+                {
+                    var skinnable = (SkinnableDrawable)child;
                     skinnable.LifetimeEnd = skinnable.Drawable.LifetimeEnd;
+                }
             }
         }
 

From 97207c11f55f5a0f464a67c7543c312e2b81ee7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 18:52:21 +0900
Subject: [PATCH 609/709] Add base transformer for osu!mania argon skin

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  4 +++
 .../Argon/ManiaArgonSkinTransformer.cs        | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 061dedb07a..c6b20b1baf 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -26,6 +26,7 @@ using osu.Game.Rulesets.Mania.Edit.Setup;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mania.Skinning.Argon;
 using osu.Game.Rulesets.Mania.Skinning.Legacy;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -68,6 +69,9 @@ namespace osu.Game.Rulesets.Mania
             {
                 case LegacySkin:
                     return new ManiaLegacySkinTransformer(skin, beatmap);
+
+                case ArgonSkin:
+                    return new ManiaArgonSkinTransformer(skin);
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
new file mode 100644
index 0000000000..67dd484923
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.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.Graphics;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ManiaArgonSkinTransformer : SkinTransformer
+    {
+        public ManiaArgonSkinTransformer(ISkin skin)
+            : base(skin)
+        {
+        }
+
+        public override Drawable? GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case ManiaSkinComponent maniaComponent:
+                    switch (maniaComponent.Component)
+                    {
+                        case ManiaSkinComponents.KeyArea:
+                            return new ArgonKeyArea();
+
+                        // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
+                    }
+
+                    break;
+            }
+
+            return base.GetDrawableComponent(component);
+        }
+    }
+}

From 326a3e65834a3950ccd49c361e17cac6a88f5ed5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 18:52:35 +0900
Subject: [PATCH 610/709] Add TODO in osu! argon transformer regarding missing
 components

---
 osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 7bc6723afb..3794350f6a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -56,6 +56,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.CursorTrail:
                             return new ArgonCursorTrail();
+
+                        // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     }
 
                     break;

From 83e7cc1e09b45adcd1454f63d74b0dd9c5e5c6d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 18:52:43 +0900
Subject: [PATCH 611/709] Add argon key area

---
 .../Skinning/Argon/ArgonKeyArea.cs            | 167 ++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
new file mode 100644
index 0000000000..055c21390c
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -0,0 +1,167 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private const float key_icon_size = 10;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container directionContainer = null!;
+        private Container<Circle> keyIcon = null!;
+        private Drawable gradient = null!;
+
+        [Resolved]
+        private Column column { get; set; } = null!;
+
+        public ArgonKeyArea()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            const float icon_circle_size = 8;
+            const float icon_spacing = 8;
+            const float icon_vertical_offset = 20;
+
+            InternalChild = directionContainer = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = Stage.HIT_TARGET_POSITION,
+                Children = new[]
+                {
+                    gradient = new Box
+                    {
+                        Name = "Key gradient",
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.5f
+                    },
+                    keyIcon = new Container<Circle>
+                    {
+                        Name = "Icons",
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Children = new[]
+                        {
+                            new Circle
+                            {
+                                Y = icon_vertical_offset,
+                                Size = new Vector2(icon_circle_size),
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Blending = BlendingParameters.Additive,
+                                Colour = column.AccentColour,
+                                Masking = true,
+                            },
+                            new Circle
+                            {
+                                X = -icon_spacing,
+                                Y = icon_vertical_offset + icon_spacing * 1.2f,
+                                Size = new Vector2(icon_circle_size),
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Blending = BlendingParameters.Additive,
+                                Colour = column.AccentColour,
+                                Masking = true,
+                            },
+                            new Circle
+                            {
+                                X = icon_spacing,
+                                Y = icon_vertical_offset + icon_spacing * 1.2f,
+                                Size = new Vector2(icon_circle_size),
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Blending = BlendingParameters.Additive,
+                                Colour = column.AccentColour,
+                                Masking = true,
+                            }
+                        }
+                    },
+                }
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            switch (direction.NewValue)
+            {
+                case ScrollingDirection.Up:
+                    directionContainer.Scale = new Vector2(1, -1);
+                    directionContainer.Anchor = Anchor.TopLeft;
+                    directionContainer.Origin = Anchor.BottomLeft;
+                    gradient.Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0));
+                    break;
+
+                case ScrollingDirection.Down:
+                    directionContainer.Scale = new Vector2(1, 1);
+                    directionContainer.Anchor = Anchor.BottomLeft;
+                    directionContainer.Origin = Anchor.BottomLeft;
+                    gradient.Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0), Color4.Black);
+                    break;
+            }
+        }
+
+        public bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
+        {
+            if (e.Action == column.Action.Value)
+            {
+                foreach (var circle in keyIcon.Children)
+                {
+                    circle.ScaleTo(1.1f, 50, Easing.OutQuint);
+
+                    circle.FadeColour(Color4.White, 50, Easing.OutQuint);
+                    circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Color4.White.Opacity(0.05f),
+                        Radius = 10,
+                    }, 50, Easing.OutQuint);
+                }
+            }
+
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
+        {
+            if (e.Action == column.Action.Value)
+            {
+                foreach (var circle in keyIcon.Children)
+                {
+                    circle.ScaleTo(1f, 125, Easing.OutQuint);
+
+                    circle.FadeColour(column.AccentColour, 200, Easing.OutQuint);
+                    circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Color4.White.Opacity(0),
+                        Radius = 10,
+                    }, 200, Easing.OutQuint);
+                }
+            }
+        }
+    }
+}

From 4718f4ac249017a695c5421fbc9e3c3ac1897228 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 19:13:37 +0900
Subject: [PATCH 612/709] Add second icon and improve glow effect

---
 .../Skinning/Argon/ArgonKeyArea.cs            | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 055c21390c..1bda832b76 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -1,11 +1,11 @@
 // 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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
@@ -20,13 +20,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public class ArgonKeyArea : CompositeDrawable, IKeyBindingHandler<ManiaAction>
     {
-        private const float key_icon_size = 10;
-
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container directionContainer = null!;
-        private Container<Circle> keyIcon = null!;
-        private Drawable gradient = null!;
+        private Container keyIcon = null!;
+        private Drawable background = null!;
 
         [Resolved]
         private Column column { get; set; } = null!;
@@ -40,8 +38,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private void load(IScrollingInfo scrollingInfo)
         {
             const float icon_circle_size = 8;
-            const float icon_spacing = 8;
-            const float icon_vertical_offset = 20;
+            const float icon_spacing = 7;
+            const float icon_vertical_offset = -30;
 
             InternalChild = directionContainer = new Container
             {
@@ -49,13 +47,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 Height = Stage.HIT_TARGET_POSITION,
                 Children = new[]
                 {
-                    gradient = new Box
+                    background = new Box
                     {
                         Name = "Key gradient",
                         RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.5f
+                        Colour = column.AccentColour.Darken(0.6f),
                     },
-                    keyIcon = new Container<Circle>
+                    keyIcon = new Container
                     {
                         Name = "Icons",
                         RelativeSizeAxes = Axes.Both,
@@ -67,8 +65,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                             {
                                 Y = icon_vertical_offset,
                                 Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
+                                Anchor = Anchor.BottomCentre,
+                                Origin = Anchor.Centre,
                                 Blending = BlendingParameters.Additive,
                                 Colour = column.AccentColour,
                                 Masking = true,
@@ -78,8 +76,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                 X = -icon_spacing,
                                 Y = icon_vertical_offset + icon_spacing * 1.2f,
                                 Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
+                                Anchor = Anchor.BottomCentre,
+                                Origin = Anchor.Centre,
                                 Blending = BlendingParameters.Additive,
                                 Colour = column.AccentColour,
                                 Masking = true,
@@ -89,11 +87,30 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                 X = icon_spacing,
                                 Y = icon_vertical_offset + icon_spacing * 1.2f,
                                 Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
+                                Anchor = Anchor.BottomCentre,
+                                Origin = Anchor.Centre,
                                 Blending = BlendingParameters.Additive,
                                 Colour = column.AccentColour,
                                 Masking = true,
+                            },
+                            new CircularContainer
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.Centre,
+                                Y = -icon_vertical_offset,
+                                Size = new Vector2(22, 14),
+                                Masking = true,
+                                BorderThickness = 4,
+                                BorderColour = Color4.White,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Alpha = 0,
+                                        AlwaysPresent = true,
+                                    },
+                                },
                             }
                         }
                     },
@@ -112,14 +129,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     directionContainer.Scale = new Vector2(1, -1);
                     directionContainer.Anchor = Anchor.TopLeft;
                     directionContainer.Origin = Anchor.BottomLeft;
-                    gradient.Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0));
                     break;
 
                 case ScrollingDirection.Down:
                     directionContainer.Scale = new Vector2(1, 1);
                     directionContainer.Anchor = Anchor.BottomLeft;
                     directionContainer.Origin = Anchor.BottomLeft;
-                    gradient.Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0), Color4.Black);
                     break;
             }
         }
@@ -128,7 +143,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action == column.Action.Value)
             {
-                foreach (var circle in keyIcon.Children)
+                foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
                     circle.ScaleTo(1.1f, 50, Easing.OutQuint);
 
@@ -136,8 +151,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = Color4.White.Opacity(0.05f),
-                        Radius = 10,
+                        Colour = Color4.White.Opacity(circle is Circle ? 0.05f : 0.2f),
+                        Radius = 40,
                     }, 50, Easing.OutQuint);
                 }
             }
@@ -149,16 +164,19 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action == column.Action.Value)
             {
-                foreach (var circle in keyIcon.Children)
+                foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
                     circle.ScaleTo(1f, 125, Easing.OutQuint);
 
-                    circle.FadeColour(column.AccentColour, 200, Easing.OutQuint);
+                    // TODO: temp lol
+                    if (circle is Circle)
+                        circle.FadeColour(column.AccentColour, 200, Easing.OutQuint);
+
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Colour = Color4.White.Opacity(0),
-                        Radius = 10,
+                        Radius = 30,
                     }, 200, Easing.OutQuint);
                 }
             }

From d32eb6456112ef071fc5ccfc98ea74ba2f4e8007 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 19:32:58 +0900
Subject: [PATCH 613/709] Adjust colour application to stay around a bit longer

---
 .../Skinning/Argon/ArgonKeyArea.cs                 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 1bda832b76..63e00041b8 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -143,9 +143,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action == column.Action.Value)
             {
+                background
+                    .FadeColour(column.AccentColour.Lighten(0.3f), 50, Easing.OutQuint).Then()
+                    .FadeColour(column.AccentColour, 100, Easing.OutQuint);
+
                 foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
-                    circle.ScaleTo(1.1f, 50, Easing.OutQuint);
+                    circle.ScaleTo(0.9f, 50, Easing.OutQuint);
 
                     circle.FadeColour(Color4.White, 50, Easing.OutQuint);
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -164,20 +168,22 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action == column.Action.Value)
             {
+                background.FadeColour(column.AccentColour.Darken(0.6f), 800, Easing.OutQuint);
+
                 foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
-                    circle.ScaleTo(1f, 125, Easing.OutQuint);
+                    circle.ScaleTo(1f, 200, Easing.OutQuint);
 
                     // TODO: temp lol
                     if (circle is Circle)
-                        circle.FadeColour(column.AccentColour, 200, Easing.OutQuint);
+                        circle.FadeColour(column.AccentColour, 800, Easing.OutQuint);
 
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Colour = Color4.White.Opacity(0),
                         Radius = 30,
-                    }, 200, Easing.OutQuint);
+                    }, 800, Easing.OutQuint);
                 }
             }
         }

From 36e2f5c512783d9f542f23fb4e7a4b69efceaa59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Sep 2022 19:48:27 +0900
Subject: [PATCH 614/709] Add argon hit target pieces

---
 .../Skinning/Argon/ArgonHitTarget.cs          | 33 +++++++++++++++++++
 .../Skinning/Argon/ArgonKeyArea.cs            | 27 +++++++++++++--
 .../Argon/ManiaArgonSkinTransformer.cs        |  3 ++
 3 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
new file mode 100644
index 0000000000..6518607c9d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
@@ -0,0 +1,33 @@
+// 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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Skinning.Default;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonHitTarget : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = DefaultNotePiece.NOTE_HEIGHT;
+
+            InternalChildren = new[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.3f,
+                    Blending = BlendingParameters.Additive,
+                    Colour = Color4.White
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 63e00041b8..f2acc61416 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -26,6 +27,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private Container keyIcon = null!;
         private Drawable background = null!;
 
+        private Circle hitTargetLine = null!;
+
         [Resolved]
         private Column column { get; set; } = null!;
 
@@ -61,6 +64,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         Origin = Anchor.TopCentre,
                         Children = new[]
                         {
+                            hitTargetLine = new Circle()
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.Centre,
+                                Colour = OsuColour.Gray(196 / 255f),
+                                Height = 4,
+                                Masking = true,
+                            },
                             new Circle
                             {
                                 Y = icon_vertical_offset,
@@ -149,13 +161,18 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                 foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
                 {
-                    circle.ScaleTo(0.9f, 50, Easing.OutQuint);
+                    if (circle != hitTargetLine)
+                        circle.ScaleTo(0.9f, 50, Easing.OutQuint);
 
                     circle.FadeColour(Color4.White, 50, Easing.OutQuint);
+
+                    // TODO: VERY TMPOERAOIRY.
+                    float f = circle == hitTargetLine ? 0.2f : (circle is Circle ? 0.05f : 0.2f);
+
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = Color4.White.Opacity(circle is Circle ? 0.05f : 0.2f),
+                        Colour = Color4.White.Opacity(f),
                         Radius = 40,
                     }, 50, Easing.OutQuint);
                 }
@@ -175,7 +192,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     circle.ScaleTo(1f, 200, Easing.OutQuint);
 
                     // TODO: temp lol
-                    if (circle is Circle)
+                    if (circle == hitTargetLine)
+                    {
+                        circle.FadeColour(OsuColour.Gray(196 / 255f), 800, Easing.OutQuint);
+                    }
+                    else if (circle is Circle)
                         circle.FadeColour(column.AccentColour, 800, Easing.OutQuint);
 
                     circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 67dd484923..dab71a65c3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -20,6 +20,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 case ManiaSkinComponent maniaComponent:
                     switch (maniaComponent.Component)
                     {
+                        case ManiaSkinComponents.HitTarget:
+                            return new ArgonHitTarget();
+
                         case ManiaSkinComponents.KeyArea:
                             return new ArgonKeyArea();
 

From 21620bee1adce55fb12a6b9b65f7f0ad4ed0e675 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 4 Oct 2022 14:58:00 +0900
Subject: [PATCH 615/709] Attempt to fix deadlock in test

---
 ...stSceneOnlinePlayBeatmapAvailabilityTracker.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 3f20f843a7..e7590df3e0 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -78,7 +77,7 @@ namespace osu.Game.Tests.Online
                 }
             };
 
-            beatmaps.AllowImport = new TaskCompletionSource<bool>();
+            beatmaps.AllowImport.Reset();
 
             testBeatmapFile = TestResources.GetQuickTestBeatmapForImport();
 
@@ -132,7 +131,7 @@ namespace osu.Game.Tests.Online
             AddStep("finish download", () => ((TestDownloadRequest)beatmapDownloader.GetExistingDownload(testBeatmapSet))!.TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
-            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
             AddUntilStep("wait for import", () => beatmaps.CurrentImport != null);
             AddUntilStep("ensure beatmap available", () => beatmaps.IsAvailableLocally(testBeatmapSet));
             addAvailabilityCheckStep("state is locally available", BeatmapAvailability.LocallyAvailable);
@@ -141,7 +140,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsSoftDeleting()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
             AddStep("import beatmap", () => beatmaps.Import(testBeatmapFile).WaitSafely());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
@@ -155,7 +154,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsChecksum()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
             AddStep("import beatmap", () => beatmaps.Import(testBeatmapFile).WaitSafely());
             addAvailabilityCheckStep("initially locally available", BeatmapAvailability.LocallyAvailable);
 
@@ -202,7 +201,7 @@ namespace osu.Game.Tests.Online
 
         private class TestBeatmapManager : BeatmapManager
         {
-            public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
+            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
 
             public Live<BeatmapSetInfo> CurrentImport { get; private set; }
 
@@ -229,7 +228,9 @@ namespace osu.Game.Tests.Online
 
                 public override Live<BeatmapSetInfo> ImportModel(BeatmapSetInfo item, ArchiveReader archive = null, bool batchImport = false, CancellationToken cancellationToken = default)
                 {
-                    testBeatmapManager.AllowImport.Task.WaitSafely();
+                    if (!testBeatmapManager.AllowImport.Wait(TimeSpan.FromSeconds(10), cancellationToken))
+                        throw new TimeoutException("Timeout waiting for import to be allowed.");
+
                     return (testBeatmapManager.CurrentImport = base.ImportModel(item, archive, batchImport, cancellationToken));
                 }
             }

From 5d80950eaf51f01f37471bf59f46f27f67d4f809 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 Oct 2022 14:01:36 +0900
Subject: [PATCH 616/709] Compute lifetime from entry in scrolling container

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 55 ++++++++++++-------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index d0aca4e7fc..b012abb6b5 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -5,10 +5,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -127,6 +127,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private float scrollLength => scrollingAxis == Direction.Horizontal ? DrawWidth : DrawHeight;
 
+        public override void Add(HitObjectLifetimeEntry entry)
+        {
+            // Scroll info is not available until loaded.
+            // The lifetime of all entries will be updated in the first Update.
+            if (IsLoaded)
+                setComputedLifetimeStart(entry);
+
+            base.Add(entry);
+        }
+
         protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
         {
             base.AddDrawable(entry, drawable);
@@ -145,7 +155,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private void invalidateHitObject(DrawableHitObject hitObject)
         {
-            hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
             layoutComputed.Remove(hitObject);
         }
 
@@ -157,10 +166,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             layoutComputed.Clear();
 
-            // Reset lifetime to the conservative estimation.
-            // If a drawable becomes alive by this lifetime, its lifetime will be updated to a more precise lifetime in the next update.
             foreach (var entry in Entries)
-                entry.SetInitialLifetime();
+                setComputedLifetimeStart(entry);
 
             scrollingInfo.Algorithm.Reset();
 
@@ -187,38 +194,46 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
+        /// <summary>
+        /// Get a conservative maximum bounding box of a <see cref="DrawableHitObject"/> corresponding to <paramref name="entry"/>.
+        /// It is used to calculate when the hit object appears.
+        /// </summary>
+        protected virtual RectangleF GetConservativeBoundingBox(HitObjectLifetimeEntry entry) => new RectangleF().Inflate(100);
+
+        private double computeDisplayStartTime(HitObjectLifetimeEntry entry)
         {
-            // Origin position may be relative to the parent size
-            Debug.Assert(hitObject.Parent != null);
+            RectangleF boundingBox = GetConservativeBoundingBox(entry);
+            float startOffset = 0;
 
-            float originAdjustment = 0.0f;
-
-            // calculate the dimension of the part of the hitobject that should already be visible
-            // when the hitobject origin first appears inside the scrolling container
             switch (direction.Value)
             {
-                case ScrollingDirection.Up:
-                    originAdjustment = hitObject.OriginPosition.Y;
+                case ScrollingDirection.Right:
+                    startOffset = boundingBox.Right;
                     break;
 
                 case ScrollingDirection.Down:
-                    originAdjustment = hitObject.DrawHeight - hitObject.OriginPosition.Y;
+                    startOffset = boundingBox.Bottom;
                     break;
 
                 case ScrollingDirection.Left:
-                    originAdjustment = hitObject.OriginPosition.X;
+                    startOffset = -boundingBox.Left;
                     break;
 
-                case ScrollingDirection.Right:
-                    originAdjustment = hitObject.DrawWidth - hitObject.OriginPosition.X;
+                case ScrollingDirection.Up:
+                    startOffset = -boundingBox.Top;
                     break;
             }
 
-            double computedStartTime = scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
+            return scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+        }
+
+        private void setComputedLifetimeStart(HitObjectLifetimeEntry entry)
+        {
+            double computedStartTime = computeDisplayStartTime(entry);
 
             // always load the hitobject before its first judgement offset
-            return Math.Min(hitObject.HitObject.StartTime - hitObject.MaximumJudgementOffset, computedStartTime);
+            double judgementOffset = entry.HitObject.HitWindows?.WindowFor(Scoring.HitResult.Miss) ?? 0;
+            entry.LifetimeStart = Math.Min(entry.HitObject.StartTime - judgementOffset, computedStartTime);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From 781f5420b0d1aa0a1f359c0f74e59a2787851ce8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 Oct 2022 15:17:11 +0900
Subject: [PATCH 617/709] Add test for scrolling hit object lifetime

---
 .../Gameplay/TestSceneScrollingHitObjects.cs  | 70 +++++++++++++++----
 .../UI/Scrolling/ScrollingPlayfield.cs        |  4 +-
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index 8a4818d2f8..98afbe92b1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -11,8 +11,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
@@ -167,14 +169,39 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add control points", () => addControlPoints(testControlPoints, Time.Current));
         }
 
-        private void addHitObject(double time)
+        [Test]
+        public void TestVeryFlowScroll()
+        {
+            const double long_time_range = 100000;
+            var manualClock = new ManualClock();
+
+            AddStep("set manual clock", () =>
+            {
+                manualClock.CurrentTime = 0;
+                scrollContainers.ForEach(c => c.Clock = new FramedClock(manualClock));
+
+                setScrollAlgorithm(ScrollVisualisationMethod.Constant);
+                scrollContainers.ForEach(c => c.TimeRange = long_time_range);
+            });
+
+            AddStep("add hit objects", () =>
+            {
+                addHitObject(long_time_range);
+                addHitObject(long_time_range + 100, 250);
+            });
+
+            AddAssert("hit objects are alive", () => playfields.All(p => p.HitObjectContainer.AliveObjects.Count() == 2));
+        }
+
+        private void addHitObject(double time, float size = 75)
         {
             playfields.ForEach(p =>
             {
-                var hitObject = new TestDrawableHitObject(time);
-                setAnchor(hitObject, p);
+                var hitObject = new TestHitObject(size) { StartTime = time };
+                var drawable = new TestDrawableHitObject(hitObject);
 
-                p.Add(hitObject);
+                setAnchor(drawable, p);
+                p.Add(drawable);
             });
         }
 
@@ -248,6 +275,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                     }
                 };
             }
+
+            protected override ScrollingHitObjectContainer CreateScrollingHitObjectContainer() => new TestScrollingHitObjectContainer();
         }
 
         private class TestDrawableControlPoint : DrawableHitObject<HitObject>
@@ -281,22 +310,39 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private class TestDrawableHitObject : DrawableHitObject<HitObject>
+        private class TestHitObject : HitObject
         {
-            public TestDrawableHitObject(double time)
-                : base(new HitObject { StartTime = time, HitWindows = HitWindows.Empty })
-            {
-                Origin = Anchor.Custom;
-                OriginPosition = new Vector2(75 / 4.0f);
+            public readonly float Size;
 
-                AutoSizeAxes = Axes.Both;
+            public TestHitObject(float size)
+            {
+                Size = size;
+            }
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject<TestHitObject>
+        {
+            public TestDrawableHitObject(TestHitObject hitObject)
+                : base(hitObject)
+            {
+                Origin = Anchor.Centre;
+                Size = new Vector2(hitObject.Size);
 
                 AddInternal(new Box
                 {
-                    Size = new Vector2(75),
+                    RelativeSizeAxes = Axes.Both,
                     Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1)
                 });
             }
         }
+
+        private class TestScrollingHitObjectContainer : ScrollingHitObjectContainer
+        {
+            protected override RectangleF GetConservativeBoundingBox(HitObjectLifetimeEntry entry)
+            {
+                var hitObject = (TestHitObject)entry.HitObject;
+                return new RectangleF().Inflate(hitObject.Size / 2);
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 078f06b745..34e5b7f9de 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// </summary>
         public virtual Vector2 ScreenSpacePositionAtTime(double time) => HitObjectContainer.ScreenSpacePositionAtTime(time);
 
-        protected sealed override HitObjectContainer CreateHitObjectContainer() => new ScrollingHitObjectContainer();
+        protected sealed override HitObjectContainer CreateHitObjectContainer() => CreateScrollingHitObjectContainer();
+
+        protected virtual ScrollingHitObjectContainer CreateScrollingHitObjectContainer() => new ScrollingHitObjectContainer();
     }
 }

From 1cccd03480dcf9c54031ac564a0e947ecb76d56e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 Oct 2022 15:03:04 +0900
Subject: [PATCH 618/709] Fix scrolling nested hit object lifetime not set

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index b012abb6b5..37da157cc1 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -251,8 +251,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             {
                 updateLayoutRecursive(obj);
 
-                // Nested hitobjects don't need to scroll, but they do need accurate positions
+                // Nested hitobjects don't need to scroll, but they do need accurate positions and start lifetime
                 updatePosition(obj, hitObject.HitObject.StartTime);
+                setComputedLifetimeStart(obj.Entry);
             }
         }
 

From 2aa4d21c757c84dd4ddefffd3620b326f7b6b0d8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 Oct 2022 15:08:53 +0900
Subject: [PATCH 619/709] Remove code that is not needed anymore

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs  | 4 ----
 .../Objects/Drawables/DrawableManiaHitObject.cs               | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 6020348938..a607ed572d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -54,10 +54,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
         }
 
-        protected override void UpdateInitialTransforms()
-        {
-        }
-
         protected override void UpdateStartTimeStateTransforms() => this.FadeOut(150);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index bcc10ab7bc..6cd39d835d 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -23,10 +23,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
-        // Leaving the default (10s) makes hitobjects not appear, as this offset is used for the initial state transforms.
-        // Calculated as DrawableManiaRuleset.MAX_TIME_RANGE + some additional allowance for velocity < 1.
-        protected override double InitialLifetimeOffset => 30000;
-
         [Resolved(canBeNull: true)]
         private ManiaPlayfield playfield { get; set; }
 

From 1ffa0afafc2663b780f93a48cca3d048d601daf0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 16:05:36 +0900
Subject: [PATCH 620/709] Tweak visuals and fix up code quality

---
 .../Skinning/Argon/ArgonKeyArea.cs            | 189 ++++++++++--------
 1 file changed, 107 insertions(+), 82 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index f2acc61416..0153cdbd68 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -1,7 +1,6 @@
 // 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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -24,11 +23,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Container directionContainer = null!;
-        private Container keyIcon = null!;
         private Drawable background = null!;
 
         private Circle hitTargetLine = null!;
 
+        private Container<Circle> bottomIcon = null!;
+        private CircularContainer topIcon = null!;
+
         [Resolved]
         private Column column { get; set; } = null!;
 
@@ -56,56 +57,58 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         RelativeSizeAxes = Axes.Both,
                         Colour = column.AccentColour.Darken(0.6f),
                     },
-                    keyIcon = new Container
+                    hitTargetLine = new Circle
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Colour = OsuColour.Gray(196 / 255f),
+                        Height = 4,
+                        Masking = true,
+                    },
+                    new Container
                     {
                         Name = "Icons",
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Children = new[]
+                        Children = new Drawable[]
                         {
-                            hitTargetLine = new Circle()
+                            bottomIcon = new Container<Circle>
                             {
-                                RelativeSizeAxes = Axes.X,
-                                Anchor = Anchor.TopCentre,
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.BottomCentre,
                                 Origin = Anchor.Centre,
-                                Colour = OsuColour.Gray(196 / 255f),
-                                Height = 4,
-                                Masking = true,
-                            },
-                            new Circle
-                            {
+                                Blending = BlendingParameters.Additive,
+                                Colour = column.AccentColour,
                                 Y = icon_vertical_offset,
-                                Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.BottomCentre,
-                                Origin = Anchor.Centre,
-                                Blending = BlendingParameters.Additive,
-                                Colour = column.AccentColour,
-                                Masking = true,
+                                Children = new[]
+                                {
+                                    new Circle
+                                    {
+                                        Size = new Vector2(icon_circle_size),
+                                        Anchor = Anchor.BottomCentre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new Circle
+                                    {
+                                        X = -icon_spacing,
+                                        Y = icon_spacing * 1.2f,
+                                        Size = new Vector2(icon_circle_size),
+                                        Anchor = Anchor.BottomCentre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                    new Circle
+                                    {
+                                        X = icon_spacing,
+                                        Y = icon_spacing * 1.2f,
+                                        Size = new Vector2(icon_circle_size),
+                                        Anchor = Anchor.BottomCentre,
+                                        Origin = Anchor.Centre,
+                                    },
+                                }
                             },
-                            new Circle
-                            {
-                                X = -icon_spacing,
-                                Y = icon_vertical_offset + icon_spacing * 1.2f,
-                                Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.BottomCentre,
-                                Origin = Anchor.Centre,
-                                Blending = BlendingParameters.Additive,
-                                Colour = column.AccentColour,
-                                Masking = true,
-                            },
-                            new Circle
-                            {
-                                X = icon_spacing,
-                                Y = icon_vertical_offset + icon_spacing * 1.2f,
-                                Size = new Vector2(icon_circle_size),
-                                Anchor = Anchor.BottomCentre,
-                                Origin = Anchor.Centre,
-                                Blending = BlendingParameters.Additive,
-                                Colour = column.AccentColour,
-                                Masking = true,
-                            },
-                            new CircularContainer
+                            topIcon = new CircularContainer
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.Centre,
@@ -153,29 +156,41 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
         public bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
         {
-            if (e.Action == column.Action.Value)
+            if (e.Action != column.Action.Value) return false;
+
+            const double lighting_fade_in_duration = 50;
+            Color4 lightingColour = column.AccentColour.Lighten(0.9f);
+
+            background
+                .FadeColour(column.AccentColour.Lighten(0.4f), 40).Then()
+                .FadeColour(column.AccentColour, 150, Easing.OutQuint);
+
+            hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
+            hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
             {
-                background
-                    .FadeColour(column.AccentColour.Lighten(0.3f), 50, Easing.OutQuint).Then()
-                    .FadeColour(column.AccentColour, 100, Easing.OutQuint);
+                Type = EdgeEffectType.Glow,
+                Colour = lightingColour.Opacity(0.7f),
+                Radius = 20,
+            }, lighting_fade_in_duration, Easing.OutQuint);
 
-                foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
+            topIcon.ScaleTo(0.9f, lighting_fade_in_duration, Easing.OutQuint);
+            topIcon.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = lightingColour.Opacity(0.1f),
+                Radius = 20,
+            }, lighting_fade_in_duration, Easing.OutQuint);
+
+            bottomIcon.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
+
+            foreach (var circle in bottomIcon)
+            {
+                circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                 {
-                    if (circle != hitTargetLine)
-                        circle.ScaleTo(0.9f, 50, Easing.OutQuint);
-
-                    circle.FadeColour(Color4.White, 50, Easing.OutQuint);
-
-                    // TODO: VERY TMPOERAOIRY.
-                    float f = circle == hitTargetLine ? 0.2f : (circle is Circle ? 0.05f : 0.2f);
-
-                    circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Color4.White.Opacity(f),
-                        Radius = 40,
-                    }, 50, Easing.OutQuint);
-                }
+                    Type = EdgeEffectType.Glow,
+                    Colour = lightingColour.Opacity(0.3f),
+                    Radius = 60,
+                }, lighting_fade_in_duration, Easing.OutQuint);
             }
 
             return false;
@@ -183,29 +198,39 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
         public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
         {
-            if (e.Action == column.Action.Value)
+            if (e.Action != column.Action.Value) return;
+
+            const double lighting_fade_out_duration = 300;
+            Color4 lightingColour = column.AccentColour.Lighten(0.9f).Opacity(0);
+
+            background.FadeColour(column.AccentColour.Darken(0.6f), lighting_fade_out_duration, Easing.OutQuint);
+
+            topIcon.ScaleTo(1f, 200, Easing.OutQuint);
+            topIcon.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
             {
-                background.FadeColour(column.AccentColour.Darken(0.6f), 800, Easing.OutQuint);
+                Type = EdgeEffectType.Glow,
+                Colour = lightingColour,
+                Radius = 20,
+            }, lighting_fade_out_duration, Easing.OutQuint);
 
-                foreach (var circle in keyIcon.Children.OfType<CompositeDrawable>())
+            hitTargetLine.FadeColour(OsuColour.Gray(196 / 255f), lighting_fade_out_duration, Easing.OutQuint);
+            hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
+            {
+                Type = EdgeEffectType.Glow,
+                Colour = lightingColour,
+                Radius = 30,
+            }, lighting_fade_out_duration, Easing.OutQuint);
+
+            bottomIcon.FadeColour(column.AccentColour, lighting_fade_out_duration, Easing.OutQuint);
+
+            foreach (var circle in bottomIcon)
+            {
+                circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                 {
-                    circle.ScaleTo(1f, 200, Easing.OutQuint);
-
-                    // TODO: temp lol
-                    if (circle == hitTargetLine)
-                    {
-                        circle.FadeColour(OsuColour.Gray(196 / 255f), 800, Easing.OutQuint);
-                    }
-                    else if (circle is Circle)
-                        circle.FadeColour(column.AccentColour, 800, Easing.OutQuint);
-
-                    circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Color4.White.Opacity(0),
-                        Radius = 30,
-                    }, 800, Easing.OutQuint);
-                }
+                    Type = EdgeEffectType.Glow,
+                    Colour = lightingColour,
+                    Radius = 30,
+                }, lighting_fade_out_duration, Easing.OutQuint);
             }
         }
     }

From 15d159a97e05b80445bc2e50161b448d827f96d4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 Oct 2022 16:10:18 +0900
Subject: [PATCH 621/709] Fix tests

---
 .../Objects/Drawables/DrawableHoldNoteHead.cs             | 8 --------
 .../Visual/Gameplay/TestSceneScrollingHitObjects.cs       | 6 ++++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index d374e935ec..66cc93b033 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
@@ -30,14 +30,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public bool UpdateResult() => base.UpdateResult(true);
 
-        protected override void UpdateInitialTransforms()
-        {
-            base.UpdateInitialTransforms();
-
-            // This hitobject should never expire, so this is just a safe maximum.
-            LifetimeEnd = LifetimeStart + 30000;
-        }
-
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             // suppress the base call explicitly.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index 98afbe92b1..156a1ee34a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -340,8 +340,10 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             protected override RectangleF GetConservativeBoundingBox(HitObjectLifetimeEntry entry)
             {
-                var hitObject = (TestHitObject)entry.HitObject;
-                return new RectangleF().Inflate(hitObject.Size / 2);
+                if (entry.HitObject is TestHitObject testObject)
+                    return new RectangleF().Inflate(testObject.Size / 2);
+
+                return base.GetConservativeBoundingBox(entry);
             }
         }
     }

From 345430ab39d45f7d47231b080472bb660c364e0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 16:15:24 +0900
Subject: [PATCH 622/709] Fix argon hit target area not being aligned correctly

---
 .../Skinning/Argon/ArgonHitTarget.cs               | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
index 6518607c9d..4750118583 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
@@ -2,18 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public class ArgonHitTarget : CompositeDrawable
     {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IScrollingInfo scrollingInfo)
         {
             RelativeSizeAxes = Axes.X;
             Height = DefaultNotePiece.NOTE_HEIGHT;
@@ -28,6 +32,14 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     Colour = Color4.White
                 },
             };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            Anchor = Origin = direction.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
         }
     }
 }

From b0a948df459440dc7aefcf661e446a3eefe732bd Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Tue, 4 Oct 2022 00:17:00 -0700
Subject: [PATCH 623/709] Move `LegacySmoke` animation implementation to
 `Smoke`

---
 WeatherConfig.dat                             |   3 +
 .../Skinning/Default/DefaultSmoke.cs          |  52 -------
 .../Skinning/Legacy/LegacySmoke.cs            | 144 +-----------------
 .../Legacy/OsuLegacySkinTransformer.cs        |   2 +-
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs       | 127 +++++++++++++--
 5 files changed, 121 insertions(+), 207 deletions(-)
 create mode 100644 WeatherConfig.dat

diff --git a/WeatherConfig.dat b/WeatherConfig.dat
new file mode 100644
index 0000000000..88a312bf91
--- /dev/null
+++ b/WeatherConfig.dat
@@ -0,0 +1,3 @@
+5363943
+La Jolla,US
+F
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 65ae490882..c3bc04a858 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -1,65 +1,13 @@
 // 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 osu.Framework.Graphics;
-using osuTK;
-using osuTK.Graphics;
-
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class DefaultSmoke : Smoke
     {
-        private const double fade_out_delay = 8000;
-        private const double fade_out_speed = 3;
-        private const double fade_out_duration = 50;
-        private const float alpha = 0.5f;
-
-        public override double LifetimeEnd => SmokeEndTime + fade_out_delay + fade_out_duration + (SmokeEndTime - SmokeStartTime) / fade_out_speed;
-
         public DefaultSmoke()
         {
             Radius = 2;
         }
-
-        protected override DrawNode CreateDrawNode() => new DefaultSmokeDrawNode(this);
-
-        private class DefaultSmokeDrawNode : SmokeDrawNode
-        {
-            private double fadeOutTime;
-
-            public DefaultSmokeDrawNode(ITexturedShaderDrawable source)
-                : base(source)
-            {
-            }
-
-            public override void ApplyState()
-            {
-                base.ApplyState();
-
-                fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
-            }
-
-            protected override Color4 PointColour(SmokePoint point)
-            {
-                var color = Color4.White;
-                color.A = alpha;
-
-                double timeDoingFadeOut = fadeOutTime - point.Time;
-
-                if (timeDoingFadeOut > 0)
-                {
-                    float fraction = Math.Clamp((float)(1 - (timeDoingFadeOut / fade_out_duration)), 0, 1);
-                    fraction = MathF.Pow(fraction, 5);
-                    color.A *= fraction;
-                }
-
-                return color;
-            }
-
-            protected override float PointScale(SmokePoint point) => 1f;
-
-            protected override Vector2 PointDirection(SmokePoint point) => point.Direction;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index b8d70c1c6d..89e90cd4c8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -1,157 +1,19 @@
 // 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 osu.Framework.Graphics;
-using osu.Framework.Utils;
+using osu.Framework.Allocation;
 using osu.Game.Skinning;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public class LegacySmoke : Smoke
     {
-        // fade values
-        private const double initial_fade_out_duration = 4000;
-
-        private const double re_fade_in_speed = 3;
-        private const double re_fade_in_duration = 50;
-
-        private const double final_fade_out_speed = 2;
-        private const double final_fade_out_duration = 8000;
-
-        private const float initial_alpha = 0.6f;
-        private const float re_fade_in_alpha = 1f;
-
-        // scale values
-        private const double scale_duration = 1200;
-
-        private const float initial_scale = 0.65f;
-        private const float final_scale = 1f;
-
-        // rotation values
-        private const double rotation_duration = 500;
-
-        private const float max_rotation = 0.25f;
-
-        protected int RotationSeed { get; set; } = RNG.Next();
-
-        public override double LifetimeEnd
-        {
-            get
-            {
-                double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-                return SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
-            }
-        }
-
-        private readonly ISkin skin;
-
-        public LegacySmoke(ISkin skin)
-        {
-            this.skin = skin;
-        }
-
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
         {
             base.LoadComplete();
 
             Texture = skin.GetTexture("cursor-smoke");
         }
-
-        protected override DrawNode CreateDrawNode() => new LegacySmokeDrawNode(this);
-
-        protected class LegacySmokeDrawNode : SmokeDrawNode
-        {
-            protected new LegacySmoke Source => (LegacySmoke)base.Source;
-
-            private double initialFadeOutDurationTrunc;
-            private double firstVisiblePointTime;
-
-            private double initialFadeOutTime;
-            private double reFadeInTime;
-            private double finalFadeOutTime;
-
-            private int rotationSeed;
-            private Random rotationRNG = new Random();
-
-            public LegacySmokeDrawNode(ITexturedShaderDrawable source)
-                : base(source)
-            {
-            }
-
-            public override void ApplyState()
-            {
-                base.ApplyState();
-
-                rotationSeed = Source.RotationSeed;
-                rotationRNG = new Random(rotationSeed);
-
-                initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-                firstVisiblePointTime = SmokeEndTime - initialFadeOutDurationTrunc;
-
-                initialFadeOutTime = CurrentTime;
-                reFadeInTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / re_fade_in_speed);
-                finalFadeOutTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / final_fade_out_speed);
-            }
-
-            protected override Color4 PointColour(SmokePoint point)
-            {
-                var color = Color4.White;
-
-                double timeDoingInitialFadeOut = Math.Min(initialFadeOutTime, SmokeEndTime) - point.Time;
-
-                if (timeDoingInitialFadeOut > 0)
-                {
-                    float fraction = Math.Clamp((float)(timeDoingInitialFadeOut / initial_fade_out_duration), 0, 1);
-                    color.A = (1 - fraction) * initial_alpha;
-                }
-
-                if (color.A > 0)
-                {
-                    double timeDoingReFadeIn = reFadeInTime - point.Time / re_fade_in_speed;
-                    double timeDoingFinalFadeOut = finalFadeOutTime - point.Time / final_fade_out_speed;
-
-                    if (timeDoingFinalFadeOut > 0)
-                    {
-                        float fraction = Math.Clamp((float)(timeDoingFinalFadeOut / final_fade_out_duration), 0, 1);
-                        fraction = MathF.Pow(fraction, 5);
-                        color.A = (1 - fraction) * re_fade_in_alpha;
-                    }
-                    else if (timeDoingReFadeIn > 0)
-                    {
-                        float fraction = Math.Clamp((float)(timeDoingReFadeIn / re_fade_in_duration), 0, 1);
-                        fraction = 1 - MathF.Pow(1 - fraction, 5);
-                        color.A = fraction * (re_fade_in_alpha - color.A) + color.A;
-                    }
-                }
-
-                return color;
-            }
-
-            protected override float PointScale(SmokePoint point)
-            {
-                double timeDoingScale = CurrentTime - point.Time;
-                float fraction = Math.Clamp((float)(timeDoingScale / scale_duration), 0, 1);
-                fraction = 1 - MathF.Pow(1 - fraction, 5);
-                return fraction * (final_scale - initial_scale) + initial_scale;
-            }
-
-            protected override Vector2 PointDirection(SmokePoint point)
-            {
-                float initialAngle = MathF.Atan2(point.Direction.Y, point.Direction.X);
-                float finalAngle = initialAngle + nextRotation();
-
-                double timeDoingRotation = CurrentTime - point.Time;
-                float fraction = Math.Clamp((float)(timeDoingRotation / rotation_duration), 0, 1);
-                fraction = 1 - MathF.Pow(1 - fraction, 5);
-                float angle = fraction * (finalAngle - initialAngle) + initialAngle;
-
-                return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
-            }
-
-            private float nextRotation() => max_rotation * ((float)rotationRNG.NextDouble() * 2 - 1);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index a9186f821e..d44d2b031a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                     case OsuSkinComponents.Smoke:
                         if (GetTexture("cursor-smoke") != null)
-                            return new LegacySmoke(this);
+                            return new LegacySmoke();
 
                         return null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index fae875eedb..5d2aa2b1f6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -25,6 +25,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public IShader? TextureShader { get; private set; }
         public IShader? RoundedTextureShader { get; private set; }
 
+        public override double LifetimeEnd
+        {
+            get
+            {
+                double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+                return SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
+            }
+        }
+
         private float? radius;
 
         protected float Radius
@@ -39,21 +48,45 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected double SmokeEndTime { get; private set; } = double.MaxValue;
 
-        protected virtual float PointInterval => Radius * 7f / 8;
-
         protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
 
+        protected virtual float PointInterval => Radius * 7f / 8;
+
         private float totalDistance;
         private Vector2? lastPosition;
+        private SmokeContainer? smokeContainer;
 
         private const int max_point_count = 18_000;
 
-        [Resolved(CanBeNull = true)]
-        private SmokeContainer? smokeContainer { get; set; }
+        // fade anim values
+        private const double initial_fade_out_duration = 4000;
+
+        private const double re_fade_in_speed = 3;
+        private const double re_fade_in_duration = 50;
+
+        private const double final_fade_out_speed = 2;
+        private const double final_fade_out_duration = 8000;
+
+        private const float initial_alpha = 0.6f;
+        private const float re_fade_in_alpha = 1f;
+
+        private readonly int rotationSeed = RNG.Next();
+
+        // scale anim values
+        private const double scale_duration = 1200;
+
+        private const float initial_scale = 0.65f;
+        private const float final_scale = 1f;
+
+        // rotation anim values
+        private const double rotation_duration = 500;
+
+        private const float max_rotation = 0.25f;
 
         [BackgroundDependencyLoader]
-        private void load(ShaderManager shaders)
+        private void load(SmokeContainer container, ShaderManager shaders)
         {
+            smokeContainer = container;
             RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
             TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE);
         }
@@ -128,8 +161,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 onSmokeEnded(time);
         }
 
-        public abstract override double LifetimeEnd { get; }
-
         private void onSmokeEnded(double time)
         {
             if (smokeContainer != null)
@@ -141,7 +172,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             SmokeEndTime = time;
         }
 
-        protected abstract override DrawNode CreateDrawNode();
+        protected override DrawNode CreateDrawNode() => new SmokeDrawNode(this);
 
         protected override void Update()
         {
@@ -181,7 +212,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             }
         }
 
-        protected abstract class SmokeDrawNode : TexturedShaderDrawNode
+        protected class SmokeDrawNode : TexturedShaderDrawNode
         {
             protected new Smoke Source => (Smoke)base.Source;
 
@@ -195,7 +226,17 @@ namespace osu.Game.Rulesets.Osu.Skinning
             private Vector2 drawSize;
             private Texture? texture;
 
-            protected SmokeDrawNode(ITexturedShaderDrawable source)
+            // anim calculation vars (color, scale, direction)
+            private double initialFadeOutDurationTrunc;
+            private double firstVisiblePointTime;
+
+            private double initialFadeOutTime;
+            private double reFadeInTime;
+            private double finalFadeOutTime;
+
+            private Random rotationRNG = new Random();
+
+            public SmokeDrawNode(ITexturedShaderDrawable source)
                 : base(source)
             {
             }
@@ -214,6 +255,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 SmokeStartTime = Source.SmokeStartTime;
                 SmokeEndTime = Source.SmokeEndTime;
                 CurrentTime = Source.Clock.CurrentTime;
+
+                rotationRNG = new Random(Source.rotationSeed);
+
+                initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+                firstVisiblePointTime = SmokeEndTime - initialFadeOutDurationTrunc;
+
+                initialFadeOutTime = CurrentTime;
+                reFadeInTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / re_fade_in_speed);
+                finalFadeOutTime = CurrentTime - initialFadeOutDurationTrunc - firstVisiblePointTime * (1 - 1 / final_fade_out_speed);
             }
 
             public sealed override void Draw(IRenderer renderer)
@@ -246,11 +296,62 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 ? ((SRGBColour)DrawColourInfo.Colour).Linear
                 : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, drawSize)).Linear;
 
-            protected abstract Color4 PointColour(SmokePoint point);
+            protected virtual Color4 PointColour(SmokePoint point)
+            {
+                var color = Color4.White;
 
-            protected abstract float PointScale(SmokePoint point);
+                double timeDoingInitialFadeOut = Math.Min(initialFadeOutTime, SmokeEndTime) - point.Time;
 
-            protected abstract Vector2 PointDirection(SmokePoint point);
+                if (timeDoingInitialFadeOut > 0)
+                {
+                    float fraction = Math.Clamp((float)(timeDoingInitialFadeOut / initial_fade_out_duration), 0, 1);
+                    color.A = (1 - fraction) * initial_alpha;
+                }
+
+                if (color.A > 0)
+                {
+                    double timeDoingReFadeIn = reFadeInTime - point.Time / re_fade_in_speed;
+                    double timeDoingFinalFadeOut = finalFadeOutTime - point.Time / final_fade_out_speed;
+
+                    if (timeDoingFinalFadeOut > 0)
+                    {
+                        float fraction = Math.Clamp((float)(timeDoingFinalFadeOut / final_fade_out_duration), 0, 1);
+                        fraction = MathF.Pow(fraction, 5);
+                        color.A = (1 - fraction) * re_fade_in_alpha;
+                    }
+                    else if (timeDoingReFadeIn > 0)
+                    {
+                        float fraction = Math.Clamp((float)(timeDoingReFadeIn / re_fade_in_duration), 0, 1);
+                        fraction = 1 - MathF.Pow(1 - fraction, 5);
+                        color.A = fraction * (re_fade_in_alpha - color.A) + color.A;
+                    }
+                }
+
+                return color;
+            }
+
+            protected virtual float PointScale(SmokePoint point)
+            {
+                double timeDoingScale = CurrentTime - point.Time;
+                float fraction = Math.Clamp((float)(timeDoingScale / scale_duration), 0, 1);
+                fraction = 1 - MathF.Pow(1 - fraction, 5);
+                return fraction * (final_scale - initial_scale) + initial_scale;
+            }
+
+            protected virtual Vector2 PointDirection(SmokePoint point)
+            {
+                float initialAngle = MathF.Atan2(point.Direction.Y, point.Direction.X);
+                float finalAngle = initialAngle + nextRotation();
+
+                double timeDoingRotation = CurrentTime - point.Time;
+                float fraction = Math.Clamp((float)(timeDoingRotation / rotation_duration), 0, 1);
+                fraction = 1 - MathF.Pow(1 - fraction, 5);
+                float angle = fraction * (finalAngle - initialAngle) + initialAngle;
+
+                return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
+            }
+
+            private float nextRotation() => max_rotation * ((float)rotationRNG.NextDouble() * 2 - 1);
 
             private void drawPointQuad(SmokePoint point, RectangleF textureRect)
             {

From 395ab5889220b3d705441871904cbbfe5b7ca907 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 16:17:38 +0900
Subject: [PATCH 624/709] Attempt to fix code style infractions

---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs                | 3 +--
 .../Skinning/Argon/OsuArgonSkinTransformer.cs                  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index dab71a65c3..ec6aaf2ef7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             switch (component)
             {
                 case ManiaSkinComponent maniaComponent:
+                    // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (maniaComponent.Component)
                     {
                         case ManiaSkinComponents.HitTarget:
@@ -25,8 +26,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                         case ManiaSkinComponents.KeyArea:
                             return new ArgonKeyArea();
-
-                        // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     }
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
index 3794350f6a..bf507db50c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/OsuArgonSkinTransformer.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                     return new ArgonJudgementPiece(resultComponent.Component);
 
                 case OsuSkinComponent osuComponent:
+                    // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (osuComponent.Component)
                     {
                         case OsuSkinComponents.HitCircle:
@@ -56,8 +57,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
                         case OsuSkinComponents.CursorTrail:
                             return new ArgonCursorTrail();
-
-                        // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     }
 
                     break;

From 33f33a684571833115a3e0bd581bbc34f1e253d4 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Tue, 4 Oct 2022 00:53:03 -0700
Subject: [PATCH 625/709] Remove things that should've been removed before push

---
 WeatherConfig.dat                          | 3 ---
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 WeatherConfig.dat

diff --git a/WeatherConfig.dat b/WeatherConfig.dat
deleted file mode 100644
index 88a312bf91..0000000000
--- a/WeatherConfig.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-5363943
-La Jolla,US
-F
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index e139e16ff2..4984dc1ad1 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Logging;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -31,8 +30,6 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
-                Logger.Log("holy moly");
-
                 isSmoking = true;
                 AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.Smoke), _ => new DefaultSmoke()));
 

From c2956c6e1e9e64a1154040550e36ef5042f7adbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 17:28:15 +0900
Subject: [PATCH 626/709] Add osu! hit object dim

Stable would dim objects when they can't be hit (ie. the "miss" window
is not active yet). This was never implemented in lazer, and causes
quite large visual differences.

No one has mentioned this yet, but it will definitely be one of those
missing pieces which makes lazer feel different to stable.
---
 .../Objects/Drawables/DrawableOsuHitObject.cs   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 6f4ca30bd0..26518e0a27 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -11,7 +11,9 @@ using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -64,6 +66,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
         }
 
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
+
+            double missWindow = HitObject.HitWindows.WindowFor(HitResult.Miss);
+
+            // Of note, no one noticed this was missing for years, but it definitely feels like it should still exist.
+            // For now this is applied across all skins, and matches stable.
+            // For simplicity, dim colour is applied to the DrawableHitObject itself.
+            // We may need to make a nested container setup if this even causes a usage conflict (ie. with a mod).
+            this.FadeColour(new Color4(195, 195, 195, 255));
+            using (BeginDelayedSequence(InitialLifetimeOffset - missWindow))
+                this.FadeColour(Color4.White, 100);
+        }
+
         protected sealed override double InitialLifetimeOffset => HitObject.TimePreempt;
 
         private OsuInputManager osuActionInputManager;

From 41082ab9286921be507a3b4a82d0cc95e69b9438 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 4 Oct 2022 18:21:29 +0900
Subject: [PATCH 627/709] Fix misplaced parenthesis

---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6359ed3e27..939d3a63ed 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -565,7 +565,7 @@ namespace osu.Game
             // due to the weird decoupled ruleset logic (which can cause a crash in certain filter scenarios).
             PerformFromScreen(screen =>
             {
-                Logger.Log($"{nameof(PresentScore)} updating beatmap ({databasedBeatmap}) and ruleset ({databasedScore.ScoreInfo.Ruleset} to match score)");
+                Logger.Log($"{nameof(PresentScore)} updating beatmap ({databasedBeatmap}) and ruleset ({databasedScore.ScoreInfo.Ruleset}) to match score");
 
                 Ruleset.Value = databasedScore.ScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);

From 7293ad751ee92a3d8d3d4f5dd95d6f2260794c69 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 4 Oct 2022 18:59:33 +0900
Subject: [PATCH 628/709] Update packages

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 77c29a5d6e..c33937ad95 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.928.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 29e690a024..31b17fb8e1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 83410b08f6..a9a83e2802 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.928.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 44b99444a7720533a3240dc174a3d4165ff893b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 13:42:04 +0900
Subject: [PATCH 629/709] Hide approach circles immediate on successful hit

---
 .../Objects/Drawables/DrawableHitCircle.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index c5992b359d..23db29b9a6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -204,12 +204,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // todo: temporary / arbitrary, used for lifetime optimisation.
             this.Delay(800).FadeOut();
 
-            // in the case of an early state change, the fade should be expedited to the current point in time.
-            if (HitStateUpdateTime < HitObject.StartTime)
-                ApproachCircle.FadeOut(50);
-
             switch (state)
             {
+                default:
+                    ApproachCircle.FadeOut();
+                    break;
+
                 case ArmedState.Idle:
                     HitArea.HitAction = null;
                     break;

From e06ece7531c11c4f9a8717b1bb5f70338a27fbc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 14:15:54 +0900
Subject: [PATCH 630/709] Update framework

---
 osu.Android.props             | 2 +-
 osu.Desktop/OsuGameDesktop.cs | 7 ++++---
 osu.Game/osu.Game.csproj      | 2 +-
 osu.iOS.props                 | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c33937ad95..6ad810483b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.928.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1005.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d9ad95f96a..3ee1b3da30 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -137,12 +137,13 @@ namespace osu.Desktop
         {
             base.SetHost(host);
 
-            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
-
             var desktopWindow = (SDL2DesktopWindow)host.Window;
 
+            var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
+            if (iconStream != null)
+                desktopWindow.SetIconFromStream(iconStream);
+
             desktopWindow.CursorState |= CursorState.Hidden;
-            desktopWindow.SetIconFromStream(iconStream);
             desktopWindow.Title = Name;
             desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 31b17fb8e1..df7bfab17a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.1005.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a9a83e2802..9e2568bf7e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.928.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1005.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.928.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.1005.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 276021dd85f2abe7774f5a91e474e0f7307b55fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 14:20:01 +0900
Subject: [PATCH 631/709] Remove now unnecessary `ScheduleAfterChildren`

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 548dd2a5bb..2eec8253b3 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -335,8 +335,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private float? scoreComponentsTargetWidth;
 
-        // Schedule required to get correct DrawWidth from text after updates.
-        private void updateDetailsWidth() => SchedulerAfterChildren.AddOnce(() =>
+        private void updateDetailsWidth()
         {
             const float score_components_min_width = 88f;
 
@@ -349,7 +348,7 @@ namespace osu.Game.Screens.Play.HUD
 
             scoreComponentsTargetWidth = newWidth;
             scoreComponents.ResizeWidthTo(newWidth, panel_transition_duration, Easing.OutQuint);
-        });
+        }
 
         private void updateState()
         {

From 56d424003d240863894829e9241ad1b9b18a290a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 14:25:04 +0900
Subject: [PATCH 632/709] Fix sliders not dimming correctly due to modified
 miss window

---
 .../Objects/Drawables/DrawableOsuHitObject.cs            | 6 ++----
 osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs           | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 26518e0a27..2935791cde 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Osu.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -70,14 +70,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            double missWindow = HitObject.HitWindows.WindowFor(HitResult.Miss);
-
             // Of note, no one noticed this was missing for years, but it definitely feels like it should still exist.
             // For now this is applied across all skins, and matches stable.
             // For simplicity, dim colour is applied to the DrawableHitObject itself.
             // We may need to make a nested container setup if this even causes a usage conflict (ie. with a mod).
             this.FadeColour(new Color4(195, 195, 195, 255));
-            using (BeginDelayedSequence(InitialLifetimeOffset - missWindow))
+            using (BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
                 this.FadeColour(Color4.White, 100);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index 05fbac625e..6f55e1790f 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -1,20 +1,23 @@
 // 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.
 
-#nullable disable
-
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Scoring
 {
     public class OsuHitWindows : HitWindows
     {
+        /// <summary>
+        /// osu! ruleset has a fixed miss window regardless of difficulty settings.
+        /// </summary>
+        public const double MISS_WINDOW = 400;
+
         private static readonly DifficultyRange[] osu_ranges =
         {
             new DifficultyRange(HitResult.Great, 80, 50, 20),
             new DifficultyRange(HitResult.Ok, 140, 100, 60),
             new DifficultyRange(HitResult.Meh, 200, 150, 100),
-            new DifficultyRange(HitResult.Miss, 400, 400, 400),
+            new DifficultyRange(HitResult.Miss, MISS_WINDOW, MISS_WINDOW, MISS_WINDOW),
         };
 
         public override bool IsHitResultAllowed(HitResult result)

From 74db42394a47e11c258abc8417d6076c2f850a66 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 14:31:12 +0900
Subject: [PATCH 633/709] Silence unobserved exceptions in
 `BeginPlayingInternal`

Closes #20526.
---
 osu.Game/Online/Spectator/OnlineSpectatorClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
index a012bf49b6..48d5c0bea9 100644
--- a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
@@ -1,9 +1,9 @@
 // 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 System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Spectator
             {
                 await connection.InvokeAsync(nameof(ISpectatorServer.BeginPlaySession), state);
             }
-            catch (HubException exception)
+            catch (Exception exception)
             {
                 if (exception.GetHubExceptionMessage() == HubClientConnector.SERVER_SHUTDOWN_MESSAGE)
                 {

From 52002d91dd578efcd216930adab12546ab0c13d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 17:48:56 +0900
Subject: [PATCH 634/709] Only apply dim at top level objects

---
 .../Objects/Drawables/DrawableOsuHitObject.cs  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 2935791cde..d9d0d28477 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -70,13 +70,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            // Of note, no one noticed this was missing for years, but it definitely feels like it should still exist.
-            // For now this is applied across all skins, and matches stable.
-            // For simplicity, dim colour is applied to the DrawableHitObject itself.
-            // We may need to make a nested container setup if this even causes a usage conflict (ie. with a mod).
-            this.FadeColour(new Color4(195, 195, 195, 255));
-            using (BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
-                this.FadeColour(Color4.White, 100);
+            // Dim should only be applied at a top level, as it will be implicitly applied to nested objects.
+            if (ParentHitObject == null)
+            {
+                // Of note, no one noticed this was missing for years, but it definitely feels like it should still exist.
+                // For now this is applied across all skins, and matches stable.
+                // For simplicity, dim colour is applied to the DrawableHitObject itself.
+                // We may need to make a nested container setup if this even causes a usage conflict (ie. with a mod).
+                this.FadeColour(new Color4(195, 195, 195, 255));
+                using (BeginDelayedSequence(InitialLifetimeOffset - OsuHitWindows.MISS_WINDOW))
+                    this.FadeColour(Color4.White, 100);
+            }
         }
 
         protected sealed override double InitialLifetimeOffset => HitObject.TimePreempt;

From 04abb2ce8f1723fbf342d7cb215eea0d20d221bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:26:17 +0900
Subject: [PATCH 635/709] Update default cursor smoke implementation to use a
 texture

---
 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index c3bc04a858..1b7a39aa30 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -1,13 +1,19 @@
 // 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.Allocation;
+using osu.Framework.Graphics.Textures;
+
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class DefaultSmoke : Smoke
     {
-        public DefaultSmoke()
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
         {
-            Radius = 2;
+            // ISkinSource doesn't currently fallback to global textures.
+            // We might want to change this in the future if the intention is to allow the user to skin this as per legacy skins.
+            Texture = textures.Get("Gameplay/osu/cursor-smoke");
         }
     }
 }

From 1e5ff2679b3ba6b00b6e858561f5707e85cdd56d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:27:51 +0900
Subject: [PATCH 636/709] Rename classes to better emphasise that `Smoke` is a
 single trail segment

---
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs                   | 2 +-
 .../Default/{DefaultSmoke.cs => DefaultSmokeSegment.cs}      | 2 +-
 .../Legacy/{LegacySmoke.cs => LegacySmokeSegment.cs}         | 2 +-
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs              | 4 ++--
 osu.Game.Rulesets.Osu/Skinning/{Smoke.cs => SmokeSegment.cs} | 4 ++--
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs                   | 5 ++++-
 6 files changed, 11 insertions(+), 8 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{DefaultSmoke.cs => DefaultSmokeSegment.cs} (92%)
 rename osu.Game.Rulesets.Osu/Skinning/Legacy/{LegacySmoke.cs => LegacySmokeSegment.cs} (90%)
 rename osu.Game.Rulesets.Osu/Skinning/{Smoke.cs => SmokeSegment.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 11daa26072..3ee30ff7dc 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerBody,
-        Smoke,
+        SmokeTrail,
         ApproachCircle,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmokeSegment.cs
similarity index 92%
rename from osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmokeSegment.cs
index 1b7a39aa30..27a2dc3960 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmokeSegment.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class DefaultSmoke : Smoke
+    public class DefaultSmokeSegment : SmokeSegment
     {
         [BackgroundDependencyLoader]
         private void load(TextureStore textures)
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmokeSegment.cs
similarity index 90%
rename from osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
rename to osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmokeSegment.cs
index 89e90cd4c8..c9c7e86e86 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmokeSegment.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public class LegacySmoke : Smoke
+    public class LegacySmokeSegment : SmokeSegment
     {
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d44d2b031a..4d12b85770 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -106,9 +106,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                         return null;
 
-                    case OsuSkinComponents.Smoke:
+                    case OsuSkinComponents.SmokeTrail:
                         if (GetTexture("cursor-smoke") != null)
-                            return new LegacySmoke();
+                            return new LegacySmokeSegment();
 
                         return null;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu/Skinning/Smoke.cs
rename to osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 5d2aa2b1f6..948ec972a3 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -20,7 +20,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
-    public abstract class Smoke : Drawable, ITexturedShaderDrawable
+    public abstract class SmokeSegment : Drawable, ITexturedShaderDrawable
     {
         public IShader? TextureShader { get; private set; }
         public IShader? RoundedTextureShader { get; private set; }
@@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         protected class SmokeDrawNode : TexturedShaderDrawNode
         {
-            protected new Smoke Source => (Smoke)base.Source;
+            protected new SmokeSegment Source => (SmokeSegment)base.Source;
 
             protected double SmokeStartTime { get; private set; }
             protected double SmokeEndTime { get; private set; }
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 4984dc1ad1..d26d45c3d7 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -14,6 +14,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
+    /// <summary>
+    /// Manages smoke trails generated from user input.
+    /// </summary>
     [Cached]
     public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
@@ -31,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (e.Action == OsuAction.Smoke)
             {
                 isSmoking = true;
-                AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.Smoke), _ => new DefaultSmoke()));
+                AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
 
                 return true;
             }

From 6628ab5190409e93dd4fb46f57ac0877c1d27905 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:37:09 +0900
Subject: [PATCH 637/709] Refactor to avoid DI / event flow

There's always one active smoke segment and it's the direct child of
`SmokeContainer`. This can be simplified as such.
---
 .../Skinning/SmokeSegment.cs                  | 36 +++----------------
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    | 25 ++++++-------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 948ec972a3..245026dc0b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Rendering.Vertices;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 using osuTK.Graphics;
 
@@ -54,7 +53,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private float totalDistance;
         private Vector2? lastPosition;
-        private SmokeContainer? smokeContainer;
 
         private const int max_point_count = 18_000;
 
@@ -84,9 +82,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private const float max_rotation = 0.25f;
 
         [BackgroundDependencyLoader]
-        private void load(SmokeContainer container, ShaderManager shaders)
+        private void load(ShaderManager shaders)
         {
-            smokeContainer = container;
             RoundedTextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
             TextureShader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE);
         }
@@ -100,14 +97,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             SmokeStartTime = Time.Current;
 
             totalDistance = PointInterval;
-
-            if (smokeContainer != null)
-            {
-                smokeContainer.SmokeMoved += onSmokeMoved;
-                smokeContainer.SmokeEnded += onSmokeEnded;
-
-                onSmokeMoved(smokeContainer.LastMousePosition, Time.Current);
-            }
         }
 
         private Vector2 nextPointDirection()
@@ -116,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             return new Vector2(MathF.Sin(angle), -MathF.Cos(angle));
         }
 
-        private void onSmokeMoved(Vector2 position, double time)
+        public void AddPosition(Vector2 position, double time)
         {
             lastPosition ??= position;
 
@@ -158,17 +147,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
             lastPosition = position;
 
             if (SmokePoints.Count >= max_point_count)
-                onSmokeEnded(time);
+                FinishDrawing(time);
         }
 
-        private void onSmokeEnded(double time)
+        public void FinishDrawing(double time)
         {
-            if (smokeContainer != null)
-            {
-                smokeContainer.SmokeMoved -= onSmokeMoved;
-                smokeContainer.SmokeEnded -= onSmokeEnded;
-            }
-
             SmokeEndTime = time;
         }
 
@@ -181,17 +164,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Invalidate(Invalidation.DrawNode);
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (smokeContainer != null)
-            {
-                smokeContainer.SmokeMoved -= onSmokeMoved;
-                smokeContainer.SmokeEnded -= onSmokeEnded;
-            }
-        }
-
         protected struct SmokePoint
         {
             public Vector2 Position;
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index d26d45c3d7..c00493e087 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -1,13 +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 System;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
@@ -17,15 +16,11 @@ namespace osu.Game.Rulesets.Osu.UI
     /// <summary>
     /// Manages smoke trails generated from user input.
     /// </summary>
-    [Cached]
     public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
-        public event Action<Vector2, double>? SmokeMoved;
-        public event Action<double>? SmokeEnded;
-
         public Vector2 LastMousePosition;
 
-        private bool isSmoking;
+        private SkinnableDrawable? currentSegment;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
 
@@ -33,21 +28,22 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
-                isSmoking = true;
-                AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
-
+                AddInternal(currentSegment = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
+                addPosition(LastMousePosition, Time.Current);
                 return true;
             }
 
             return false;
         }
 
+        private void addPosition(Vector2 position, double timeCurrent) => (currentSegment?.Drawable as SmokeSegment)?.AddPosition(position, timeCurrent);
+
         public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
         {
             if (e.Action == OsuAction.Smoke)
             {
-                isSmoking = false;
-                SmokeEnded?.Invoke(Time.Current);
+                (currentSegment?.Drawable as SmokeSegment)?.FinishDrawing(Time.Current);
+                currentSegment = null;
 
                 foreach (Drawable child in Children)
                 {
@@ -59,11 +55,10 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            if (isSmoking)
-                SmokeMoved?.Invoke(e.MousePosition, Time.Current);
+            if (currentSegment != null)
+                addPosition(e.MousePosition, Time.Current);
 
             LastMousePosition = e.MousePosition;
-
             return base.OnMouseMove(e);
         }
     }

From 71edd314b1785106be7b55c3ed638c6571d70521 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:51:02 +0900
Subject: [PATCH 638/709] Simplify `SmokeContainer` lifetime logic

---
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index c00493e087..5999abc1bf 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -1,7 +1,6 @@
 // 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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -18,9 +17,9 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
-        public Vector2 LastMousePosition;
+        private SkinnableDrawable? currentSegmentSkinnable;
 
-        private SkinnableDrawable? currentSegment;
+        private Vector2 lastMousePosition;
 
         public override bool ReceivePositionalInputAt(Vector2 _) => true;
 
@@ -28,38 +27,38 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
-                AddInternal(currentSegment = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
-                addPosition(LastMousePosition, Time.Current);
+                AddInternal(currentSegmentSkinnable = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
+
+                // Add initial position immediately.
+                addPosition();
                 return true;
             }
 
             return false;
         }
 
-        private void addPosition(Vector2 position, double timeCurrent) => (currentSegment?.Drawable as SmokeSegment)?.AddPosition(position, timeCurrent);
-
         public void OnReleased(KeyBindingReleaseEvent<OsuAction> e)
         {
             if (e.Action == OsuAction.Smoke)
             {
-                (currentSegment?.Drawable as SmokeSegment)?.FinishDrawing(Time.Current);
-                currentSegment = null;
-
-                foreach (Drawable child in Children)
+                if (currentSegmentSkinnable?.Drawable is SmokeSegment segment)
                 {
-                    var skinnable = (SkinnableDrawable)child;
-                    skinnable.LifetimeEnd = skinnable.Drawable.LifetimeEnd;
+                    segment.FinishDrawing(Time.Current);
+
+                    currentSegmentSkinnable.LifetimeEnd = segment.LifetimeEnd;
+                    currentSegmentSkinnable = null;
                 }
             }
         }
 
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
-            if (currentSegment != null)
-                addPosition(e.MousePosition, Time.Current);
+            lastMousePosition = e.MousePosition;
+            addPosition();
 
-            LastMousePosition = e.MousePosition;
             return base.OnMouseMove(e);
         }
+
+        private void addPosition() => (currentSegmentSkinnable?.Drawable as SmokeSegment)?.AddPosition(lastMousePosition, Time.Current);
     }
 }

From 91d877e8931da7e4d738a57189dbb5a1e4b60902 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:52:01 +0900
Subject: [PATCH 639/709] Set `LifetimeEnd` once rather than computing on every
 access

---
 osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 245026dc0b..18e0bc5baa 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -24,15 +24,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public IShader? TextureShader { get; private set; }
         public IShader? RoundedTextureShader { get; private set; }
 
-        public override double LifetimeEnd
-        {
-            get
-            {
-                double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-                return SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
-            }
-        }
-
         private float? radius;
 
         protected float Radius
@@ -153,6 +144,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public void FinishDrawing(double time)
         {
             SmokeEndTime = time;
+
+            double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
+            LifetimeEnd = SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
         }
 
         protected override DrawNode CreateDrawNode() => new SmokeDrawNode(this);

From bd82dfc333cce808d06df5001c9e28ba387c589d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:53:07 +0900
Subject: [PATCH 640/709] Remove custom radius implementation

---
 osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 18e0bc5baa..09cbc1af1d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -24,13 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public IShader? TextureShader { get; private set; }
         public IShader? RoundedTextureShader { get; private set; }
 
-        private float? radius;
-
-        protected float Radius
-        {
-            get => radius ?? Texture?.DisplayWidth * 0.165f ?? 3;
-            set => radius = value;
-        }
+        protected float Radius => Texture?.DisplayWidth * 0.165f ?? 3;
 
         protected Texture? Texture { get; set; }
 

From 8f0ef99e10670d92855848f0318ca1b98eee8db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:54:14 +0900
Subject: [PATCH 641/709] Privatise some fields

---
 .../Skinning/SmokeSegment.cs                  | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 09cbc1af1d..99196f6967 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -21,24 +21,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 {
     public abstract class SmokeSegment : Drawable, ITexturedShaderDrawable
     {
-        public IShader? TextureShader { get; private set; }
-        public IShader? RoundedTextureShader { get; private set; }
-
-        protected float Radius => Texture?.DisplayWidth * 0.165f ?? 3;
-
-        protected Texture? Texture { get; set; }
-
-        protected double SmokeStartTime { get; private set; } = double.MinValue;
-
-        protected double SmokeEndTime { get; private set; } = double.MaxValue;
-
-        protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
-
-        protected virtual float PointInterval => Radius * 7f / 8;
-
-        private float totalDistance;
-        private Vector2? lastPosition;
-
         private const int max_point_count = 18_000;
 
         // fade anim values
@@ -66,6 +48,24 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         private const float max_rotation = 0.25f;
 
+        public IShader? TextureShader { get; private set; }
+        public IShader? RoundedTextureShader { get; private set; }
+
+        protected Texture? Texture { get; set; }
+
+        private float radius => Texture?.DisplayWidth * 0.165f ?? 3;
+
+        protected readonly List<SmokePoint> SmokePoints = new List<SmokePoint>();
+
+        private float pointInterval => radius * 7f / 8;
+
+        private double smokeStartTime { get; set; } = double.MinValue;
+
+        private double smokeEndTime { get; set; } = double.MaxValue;
+
+        private float totalDistance;
+        private Vector2? lastPosition;
+
         [BackgroundDependencyLoader]
         private void load(ShaderManager shaders)
         {
@@ -79,9 +79,9 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             RelativeSizeAxes = Axes.Both;
 
-            SmokeStartTime = Time.Current;
+            smokeStartTime = Time.Current;
 
-            totalDistance = PointInterval;
+            totalDistance = pointInterval;
         }
 
         private Vector2 nextPointDirection()
@@ -96,15 +96,15 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             float delta = (position - (Vector2)lastPosition).LengthFast;
             totalDistance += delta;
-            int count = (int)(totalDistance / PointInterval);
+            int count = (int)(totalDistance / pointInterval);
 
             if (count > 0)
             {
                 Vector2 increment = position - (Vector2)lastPosition;
                 increment.NormalizeFast();
 
-                Vector2 pointPos = (PointInterval - (totalDistance - delta)) * increment + (Vector2)lastPosition;
-                increment *= PointInterval;
+                Vector2 pointPos = (pointInterval - (totalDistance - delta)) * increment + (Vector2)lastPosition;
+                increment *= pointInterval;
 
                 if (SmokePoints.Count > 0 && SmokePoints[^1].Time > time)
                 {
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     SmokePoints.RemoveRange(index, SmokePoints.Count - index);
                 }
 
-                totalDistance %= PointInterval;
+                totalDistance %= pointInterval;
 
                 for (int i = 0; i < count; i++)
                 {
@@ -137,10 +137,10 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
         public void FinishDrawing(double time)
         {
-            SmokeEndTime = time;
+            smokeEndTime = time;
 
-            double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, SmokeEndTime - SmokeStartTime);
-            LifetimeEnd = SmokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
+            double initialFadeOutDurationTrunc = Math.Min(initial_fade_out_duration, smokeEndTime - smokeStartTime);
+            LifetimeEnd = smokeEndTime + final_fade_out_duration + initialFadeOutDurationTrunc / re_fade_in_speed + initialFadeOutDurationTrunc / final_fade_out_speed;
         }
 
         protected override DrawNode CreateDrawNode() => new SmokeDrawNode(this);
@@ -208,12 +208,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
                 points.Clear();
                 points.AddRange(Source.SmokePoints);
 
-                radius = Source.Radius;
+                radius = Source.radius;
                 drawSize = Source.DrawSize;
                 texture = Source.Texture;
 
-                SmokeStartTime = Source.SmokeStartTime;
-                SmokeEndTime = Source.SmokeEndTime;
+                SmokeStartTime = Source.smokeStartTime;
+                SmokeEndTime = Source.smokeEndTime;
                 CurrentTime = Source.Clock.CurrentTime;
 
                 rotationRNG = new Random(Source.rotationSeed);

From 64858cfb8e2dabab010f9fab666cf1cf5b0ed9f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 18:55:49 +0900
Subject: [PATCH 642/709] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index fd57862c4d..8f83c9730b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1005.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cc4f3fbab..434db87a80 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1005.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/osu.iOS.props b/osu.iOS.props
index cc922d304f..f395eab23c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.922.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1003.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1005.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
   <PropertyGroup>

From 234c6ac7998fbc6742503e1a589536255554e56a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 5 Oct 2022 20:21:15 +0900
Subject: [PATCH 643/709] Pin taiko PP calculator accuracy to osu-stable values

---
 .../Difficulty/TaikoPerformanceCalculator.cs              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
index 95a1e8bc66..dc7bad2f75 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoPerformanceCalculator.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private int countOk;
         private int countMeh;
         private int countMiss;
+        private double accuracy;
 
         private double effectiveMissCount;
 
@@ -36,6 +37,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             countOk = score.Statistics.GetValueOrDefault(HitResult.Ok);
             countMeh = score.Statistics.GetValueOrDefault(HitResult.Meh);
             countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
+            accuracy = customAccuracy;
 
             // The effectiveMissCount is calculated by gaining a ratio for totalSuccessfulHits and increasing the miss penalty for shorter object counts lower than 1000.
             if (totalSuccessfulHits > 0)
@@ -87,7 +89,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (score.Mods.Any(m => m is ModFlashlight<TaikoHitObject>))
                 difficultyValue *= 1.050 * lengthBonus;
 
-            return difficultyValue * Math.Pow(score.Accuracy, 2.0);
+            return difficultyValue * Math.Pow(accuracy, 2.0);
         }
 
         private double computeAccuracyValue(ScoreInfo score, TaikoDifficultyAttributes attributes)
@@ -95,7 +97,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
             if (attributes.GreatHitWindow <= 0)
                 return 0;
 
-            double accuracyValue = Math.Pow(60.0 / attributes.GreatHitWindow, 1.1) * Math.Pow(score.Accuracy, 8.0) * Math.Pow(attributes.StarRating, 0.4) * 27.0;
+            double accuracyValue = Math.Pow(60.0 / attributes.GreatHitWindow, 1.1) * Math.Pow(accuracy, 8.0) * Math.Pow(attributes.StarRating, 0.4) * 27.0;
 
             double lengthBonus = Math.Min(1.15, Math.Pow(totalHits / 1500.0, 0.3));
             accuracyValue *= lengthBonus;
@@ -110,5 +112,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         private int totalHits => countGreat + countOk + countMeh + countMiss;
 
         private int totalSuccessfulHits => countGreat + countOk + countMeh;
+
+        private double customAccuracy => totalHits > 0 ? (countGreat * 300 + countOk * 150) / (totalHits * 300.0) : 0;
     }
 }

From 2c0cd9ea526137ac675457936abe8224f3bcc8fc Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Wed, 5 Oct 2022 19:09:34 -0700
Subject: [PATCH 644/709] Add more smoke tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs | 68 +++++++++++++++----
 1 file changed, 55 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
index 82417d09a7..1cb64b71fc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSmoke.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
+using osu.Framework.Logging;
 using osu.Framework.Testing.Input;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK;
@@ -17,22 +19,57 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestSmoking()
         {
-            AddStep("Create smoke", () =>
+            addStep("Create short smoke", 2_000);
+            addStep("Create medium smoke", 5_000);
+            addStep("Create long smoke", 10_000);
+        }
+
+        private void addStep(string stepName, double duration)
+        {
+            var smokeContainers = new List<SmokeContainer>();
+
+            AddStep(stepName, () =>
             {
-                SetContents(_ => new SmokingInputManager
+                smokeContainers.Clear();
+                SetContents(_ =>
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.95f),
-                    Child = new TestSmokeContainer { RelativeSizeAxes = Axes.Both },
+                    smokeContainers.Add(new TestSmokeContainer
+                    {
+                        Duration = duration,
+                        RelativeSizeAxes = Axes.Both
+                    });
+
+                    return new SmokingInputManager
+                    {
+                        Duration = duration,
+                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(0.95f),
+                        Child = smokeContainers[^1],
+                    };
                 });
             });
+
+            AddUntilStep("Until skinnable expires", () =>
+            {
+                if (smokeContainers.Count == 0)
+                    return false;
+
+                Logger.Log("How many: " + smokeContainers.Count);
+
+                foreach (var smokeContainer in smokeContainers)
+                {
+                    if (smokeContainer.Children.Count != 0)
+                        return false;
+                }
+
+                return true;
+            });
         }
 
-        private const double spin_duration = 5_000;
-        private const float spin_angle = 4 * MathF.PI;
-
         private class SmokingInputManager : ManualInputManager
         {
+            public double Duration { get; init; }
+
             private double? startTime;
 
             public SmokingInputManager()
@@ -51,9 +88,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 base.Update();
 
+                const float spin_angle = 4 * MathF.PI;
+
                 startTime ??= Time.Current;
 
-                float fraction = (float)((Time.Current - startTime) / spin_duration);
+                float fraction = (float)((Time.Current - startTime) / Duration);
 
                 float angle = fraction * spin_angle;
                 float radius = fraction * Math.Min(DrawSize.X, DrawSize.Y) / 2;
@@ -65,24 +104,27 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestSmokeContainer : SmokeContainer
         {
-            private double? startTime;
+            public double Duration { get; init; }
+
             private bool isPressing;
             private bool isFinished;
 
+            private double? startTime;
+
             protected override void Update()
             {
                 base.Update();
 
-                startTime ??= Time.Current;
+                startTime ??= Time.Current + 0.1;
 
-                if (!isPressing && !isFinished && Time.Current > startTime + 0.1)
+                if (!isPressing && !isFinished && Time.Current > startTime)
                 {
                     OnPressed(new KeyBindingPressEvent<OsuAction>(new InputState(), OsuAction.Smoke));
                     isPressing = true;
                     isFinished = false;
                 }
 
-                if (isPressing && Time.Current > startTime + spin_duration)
+                if (isPressing && Time.Current > startTime + Duration)
                 {
                     OnReleased(new KeyBindingReleaseEvent<OsuAction>(new InputState(), OsuAction.Smoke));
                     isPressing = false;

From 49e023f8613d44ab03e40fda8236e4bbb0d5e774 Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Wed, 5 Oct 2022 19:11:38 -0700
Subject: [PATCH 645/709] Rename `OsuSkinComponents.SmokeTrail` to
 `CursorSmoke`

---
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs                      | 2 +-
 .../Skinning/Legacy/OsuLegacySkinTransformer.cs                 | 2 +-
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 3ee30ff7dc..4248cce55a 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerBody,
-        SmokeTrail,
+        CursorSmoke,
         ApproachCircle,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 4d12b85770..b778bc21d1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
                         return null;
 
-                    case OsuSkinComponents.SmokeTrail:
+                    case OsuSkinComponents.CursorSmoke:
                         if (GetTexture("cursor-smoke") != null)
                             return new LegacySmokeSegment();
 
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 5999abc1bf..84596c6d72 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
-                AddInternal(currentSegmentSkinnable = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
+                AddInternal(currentSegmentSkinnable = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment()));
 
                 // Add initial position immediately.
                 addPosition();

From 9d54467145af496dab6d9f6a38517b4e1903ceaa Mon Sep 17 00:00:00 2001
From: Alden Wu <aldenwu0@gmail.com>
Date: Wed, 5 Oct 2022 19:13:06 -0700
Subject: [PATCH 646/709] Make smoke skinnable lifetime more robust

---
 .../Skinning/SmokeSegment.cs                  |  2 +-
 osu.Game.Rulesets.Osu/UI/SmokeContainer.cs    | 21 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
index 99196f6967..6c998e244c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             RelativeSizeAxes = Axes.Both;
 
-            smokeStartTime = Time.Current;
+            LifetimeStart = smokeStartTime = Time.Current;
 
             totalDistance = pointInterval;
         }
diff --git a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
index 84596c6d72..beba834e88 100644
--- a/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
@@ -1,6 +1,8 @@
 // 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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -17,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
     {
-        private SkinnableDrawable? currentSegmentSkinnable;
+        private SmokeSkinnableDrawable? currentSegmentSkinnable;
 
         private Vector2 lastMousePosition;
 
@@ -27,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             if (e.Action == OsuAction.Smoke)
             {
-                AddInternal(currentSegmentSkinnable = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment()));
+                AddInternal(currentSegmentSkinnable = new SmokeSkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.CursorSmoke), _ => new DefaultSmokeSegment()));
 
                 // Add initial position immediately.
                 addPosition();
@@ -44,8 +46,6 @@ namespace osu.Game.Rulesets.Osu.UI
                 if (currentSegmentSkinnable?.Drawable is SmokeSegment segment)
                 {
                     segment.FinishDrawing(Time.Current);
-
-                    currentSegmentSkinnable.LifetimeEnd = segment.LifetimeEnd;
                     currentSegmentSkinnable = null;
                 }
             }
@@ -60,5 +60,18 @@ namespace osu.Game.Rulesets.Osu.UI
         }
 
         private void addPosition() => (currentSegmentSkinnable?.Drawable as SmokeSegment)?.AddPosition(lastMousePosition, Time.Current);
+
+        private class SmokeSkinnableDrawable : SkinnableDrawable
+        {
+            public override bool RemoveWhenNotAlive => true;
+
+            public override double LifetimeStart => Drawable.LifetimeStart;
+            public override double LifetimeEnd => Drawable.LifetimeEnd;
+
+            public SmokeSkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable>? defaultImplementation = null, ConfineMode confineMode = ConfineMode.NoScaling)
+                : base(component, defaultImplementation, confineMode)
+            {
+            }
+        }
     }
 }

From 0f6a6287f246f974a9e21304846c6b0083d8d343 Mon Sep 17 00:00:00 2001
From: NullifiedJosh <86538544+NullifiedJosh@users.noreply.github.com>
Date: Thu, 6 Oct 2022 18:17:33 +0800
Subject: [PATCH 647/709] Fix bugs and add test

---
 .../TestSceneDrawableCatchRuleset.cs          | 59 +++++++++++++++++++
 .../UI/DrawableCatchRuleset.cs                |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
new file mode 100644
index 0000000000..b826a064e6
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
@@ -0,0 +1,59 @@
+// 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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneDrawableCatchRulesetWithRelax : OsuTestScene
+    {
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create drawable ruleset with relax mod", () =>
+            {
+                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>() {
+                    new CatchModRelax()
+                });
+            });
+            AddUntilStep("wait for load", () => Child.IsLoaded);
+        }
+
+        [Test]
+        public void TestBasic()
+        {
+            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
+        }
+    }
+
+    [TestFixture]
+    public class TestSceneDrawableCatchRulesetWithoutRelax : OsuTestScene
+    {
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create drawable ruleset without relax mod", () =>
+            {
+                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>());
+            });
+            AddUntilStep("wait for load", () => Child.IsLoaded);
+            Logger.Log("Ready");
+        }
+
+        [Test]
+        public void TestBasic()
+        {
+            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 07968e4bee..dfa6126d3f 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
             : base(ruleset, beatmap, mods)
         {
             // Check if mods have RelaxMod instance
-            if (mods.OfType<ModRelax>().Any())
+            if (mods != null && mods.OfType<ModRelax>().Any())
                 showMobileMapper = false;
 
             Direction.Value = ScrollingDirection.Down;

From 6543171169b37a79b3b6ddb192dcd15b4332f4a5 Mon Sep 17 00:00:00 2001
From: NullifiedJosh <86538544+NullifiedJosh@users.noreply.github.com>
Date: Thu, 6 Oct 2022 18:30:49 +0800
Subject: [PATCH 648/709] Fix formating.

---
 .../TestSceneDrawableCatchRuleset.cs          | 38 +++++--------------
 .../UI/DrawableCatchRuleset.cs                |  2 +-
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
index b826a064e6..8b794fd919 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Mods;
@@ -15,45 +14,28 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneDrawableCatchRulesetWithRelax : OsuTestScene
+    public class TestSceneDrawableCatchRuleset : OsuTestScene
     {
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("create drawable ruleset with relax mod", () =>
-            {
-                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>() {
-                    new CatchModRelax()
-                });
-            });
-            AddUntilStep("wait for load", () => Child.IsLoaded);
-        }
-
         [Test]
-        public void TestBasic()
-        {
-            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
-        }
-    }
-
-    [TestFixture]
-    public class TestSceneDrawableCatchRulesetWithoutRelax : OsuTestScene
-    {
-        [SetUpSteps]
-        public void SetUpSteps()
+        public void TestWithoutRelax()
         {
             AddStep("create drawable ruleset without relax mod", () =>
             {
                 Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>());
             });
             AddUntilStep("wait for load", () => Child.IsLoaded);
-            Logger.Log("Ready");
+            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
         }
 
         [Test]
-        public void TestBasic()
+        public void TestWithRelax()
         {
-            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
+            AddStep("create drawable ruleset with relax mod", () =>
+            {
+                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod> { new CatchModRelax() });
+            });
+            AddUntilStep("wait for load", () => Child.IsLoaded);
+            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index dfa6126d3f..ce1fa963e7 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool UserScrollSpeedAdjustment => false;
 
-        private bool showMobileMapper = true;
+        private readonly bool showMobileMapper = true;
 
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

From ea4dbc8c0f3ef669d86439a9b1a368c213d39a26 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 Oct 2022 19:46:10 +0900
Subject: [PATCH 649/709] Fix mania hold note head disappears

---
 .../Objects/Drawables/DrawableHoldNoteHead.cs                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 66cc93b033..ac646ea427 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // the hold note head should never change its visual state on its own due to the "freezing" mechanic
             // (when hit, it remains visible in place at the judgement line; when dropped, it will scroll past the line).
             // it will be hidden along with its parenting hold note when required.
+
+            // Set `LifetimeEnd` explicitly to a non-`double.MaxValue` because otherwise this DHO is automatically expired.
+            LifetimeEnd = double.PositiveInfinity;
         }
 
         public override bool OnPressed(KeyBindingPressEvent<ManiaAction> e) => false; // Handled by the hold note

From 994db55b6d542c187d96d6905552f79d2a352d6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 02:19:43 +0900
Subject: [PATCH 650/709] Simplify check conditionals

---
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index ce1fa963e7..27f7886d79 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -27,15 +27,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override bool UserScrollSpeedAdjustment => false;
 
-        private readonly bool showMobileMapper = true;
-
         public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)
         {
-            // Check if mods have RelaxMod instance
-            if (mods != null && mods.OfType<ModRelax>().Any())
-                showMobileMapper = false;
-
             Direction.Value = ScrollingDirection.Down;
             TimeRange.Value = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450);
         }
@@ -43,7 +37,8 @@ namespace osu.Game.Rulesets.Catch.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            if (showMobileMapper)
+            // With relax mod, input maps directly to x position and left/right buttons are not used.
+            if (!Mods.Any(m => m is ModRelax))
                 KeyBindingInputManager.Add(new CatchTouchInputMapper());
         }
 

From f3262103c44ad9d430e8e3883ccb490c0916e23e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 02:21:31 +0900
Subject: [PATCH 651/709] Move test into existing catch touch test scene

---
 .../TestSceneCatchTouchInput.cs               | 35 +++++++++++++---
 .../TestSceneDrawableCatchRuleset.cs          | 41 -------------------
 2 files changed, 29 insertions(+), 47 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
index cbf6e8f202..cf6a8169c4 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs
@@ -1,10 +1,15 @@
 // 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.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -12,11 +17,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneCatchTouchInput : OsuTestScene
     {
-        private CatchTouchInputMapper catchTouchInputMapper = null!;
-
-        [SetUpSteps]
-        public void SetUpSteps()
+        [Test]
+        public void TestBasic()
         {
+            CatchTouchInputMapper catchTouchInputMapper = null!;
+
             AddStep("create input overlay", () =>
             {
                 Child = new CatchInputManager(new CatchRuleset().RulesetInfo)
@@ -32,12 +37,30 @@ namespace osu.Game.Rulesets.Catch.Tests
                     }
                 };
             });
+
+            AddStep("show overlay", () => catchTouchInputMapper.Show());
         }
 
         [Test]
-        public void TestBasic()
+        public void TestWithoutRelax()
         {
-            AddStep("show overlay", () => catchTouchInputMapper.Show());
+            AddStep("create drawable ruleset without relax mod", () =>
+            {
+                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>());
+            });
+            AddUntilStep("wait for load", () => Child.IsLoaded);
+            AddAssert("check touch input is shown", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
+        }
+
+        [Test]
+        public void TestWithRelax()
+        {
+            AddStep("create drawable ruleset with relax mod", () =>
+            {
+                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod> { new CatchModRelax() });
+            });
+            AddUntilStep("wait for load", () => Child.IsLoaded);
+            AddAssert("check touch input is not shown", () => !this.ChildrenOfType<CatchTouchInputMapper>().Any());
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
deleted file mode 100644
index 8b794fd919..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Framework.Testing;
-using osu.Game.Rulesets.Catch.Beatmaps;
-using osu.Game.Rulesets.Catch.Mods;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneDrawableCatchRuleset : OsuTestScene
-    {
-        [Test]
-        public void TestWithoutRelax()
-        {
-            AddStep("create drawable ruleset without relax mod", () =>
-            {
-                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>());
-            });
-            AddUntilStep("wait for load", () => Child.IsLoaded);
-            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
-        }
-
-        [Test]
-        public void TestWithRelax()
-        {
-            AddStep("create drawable ruleset with relax mod", () =>
-            {
-                Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod> { new CatchModRelax() });
-            });
-            AddUntilStep("wait for load", () => Child.IsLoaded);
-            AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
-        }
-    }
-}

From b27e70ca479e622b12046722d8832b8d0ee81b63 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 6 Oct 2022 21:11:00 -0700
Subject: [PATCH 652/709] Fix language settings dropdown not updating when
 changing language in first run setup

---
 .../Settings/Sections/General/LanguageSettings.cs        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 63f0dec953..0f77e6609b 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -44,9 +44,12 @@ namespace osu.Game.Overlays.Settings.Sections.General
                 },
             };
 
-            if (!LanguageExtensions.TryParseCultureCode(frameworkLocale.Value, out var locale))
-                locale = Language.en;
-            languageSelection.Current.Value = locale;
+            frameworkLocale.BindValueChanged(locale =>
+            {
+                if (!LanguageExtensions.TryParseCultureCode(locale.NewValue, out var language))
+                    language = Language.en;
+                languageSelection.Current.Value = language;
+            }, true);
 
             languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToCultureCode());
         }

From 7385ef3e1b033c37bc4bec0737ac446efe4eaa60 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 7 Oct 2022 14:26:19 +0900
Subject: [PATCH 653/709] Extract combo scale to virtual function

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index a594363d4c..69937a0fba 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -149,16 +149,21 @@ namespace osu.Game.Rulesets.Mods
                 float size = defaultFlashlightSize * sizeMultiplier;
 
                 if (comboBasedSize)
-                {
-                    if (combo >= 200)
-                        size *= 0.625f;
-                    else if (combo >= 100)
-                        size *= 0.8125f;
-                }
+                    size *= GetComboScaleFor(combo);
 
                 return size;
             }
 
+            protected virtual float GetComboScaleFor(int combo)
+            {
+                if (combo >= 200)
+                    return 0.625f;
+                if (combo >= 100)
+                    return 0.8125f;
+
+                return 1.0f;
+            }
+
             private Vector2 flashlightPosition;
 
             protected Vector2 FlashlightPosition

From c6b5fdc7d0cdab0d41cc9e41cf9e509433633427 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 7 Oct 2022 14:34:48 +0900
Subject: [PATCH 654/709] Adjust catch flashlight to closely match classic

---
 osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
index 1adc969f8f..ff957b9b73 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
-        public override float DefaultFlashlightSize => 350;
+        public override float DefaultFlashlightSize => 325;
 
         protected override Flashlight CreateFlashlight() => new CatchFlashlight(this, playfield);
 
@@ -44,7 +44,19 @@ namespace osu.Game.Rulesets.Catch.Mods
                 : base(modFlashlight)
             {
                 this.playfield = playfield;
+
                 FlashlightSize = new Vector2(0, GetSizeFor(0));
+                FlashlightSmoothness = 1.4f;
+            }
+
+            protected override float GetComboScaleFor(int combo)
+            {
+                if (combo >= 200)
+                    return 0.770f;
+                if (combo >= 100)
+                    return 0.885f;
+
+                return 1.0f;
             }
 
             protected override void Update()

From 5f3b58b7e009a0ed5c7d1028a01d89c7e754a2f4 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 7 Oct 2022 14:44:45 +0900
Subject: [PATCH 655/709] Adjust taiko flashlight to closely match classic

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index 1caacdd1d7..fca69e86cc 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 
         public override BindableBool ComboBasedSize { get; } = new BindableBool(true);
 
-        public override float DefaultFlashlightSize => 250;
+        public override float DefaultFlashlightSize => 200;
 
         protected override Flashlight CreateFlashlight() => new TaikoFlashlight(this, playfield);
 
@@ -46,7 +46,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
                 : base(modFlashlight)
             {
                 this.taikoPlayfield = taikoPlayfield;
+
                 FlashlightSize = getSizeFor(0);
+                FlashlightSmoothness = 1.4f;
 
                 AddLayout(flashlightProperties);
             }

From df3ad618e15782e28b08fa4271aa1e79560de6b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 17:49:00 +0900
Subject: [PATCH 656/709] Move `ColumnType` to constructor

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs      |  3 ++-
 .../Skinning/ColumnTestContainer.cs                 |  3 +--
 osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs    |  3 ++-
 .../TestSceneDrawableManiaHitObject.cs              |  3 ++-
 osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs      |  2 --
 osu.Game.Rulesets.Mania/UI/Column.cs                | 13 ++++++-------
 osu.Game.Rulesets.Mania/UI/Stage.cs                 |  5 ++---
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 6e6e83f9cf..d6dd2664bc 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
 
-            Add(column = new Column(0)
+            Add(column = new Column(0, ColumnType.Even)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index 1a3513d46c..33166c5aeb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -28,11 +28,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         {
             InternalChildren = new[]
             {
-                this.column = new Column(column)
+                this.column = new Column(column, column % 2 == 0 ? ColumnType.Even : ColumnType.Odd)
                 {
                     Action = { Value = action },
                     AccentColour = Color4.Orange,
-                    ColumnType = column % 2 == 0 ? ColumnType.Even : ColumnType.Odd,
                     Alpha = showColumn ? 1 : 0
                 },
                 content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 2922d18713..ab2f63339f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -84,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createColumn(ScrollingDirection direction, ManiaAction action, int index)
         {
-            var column = new Column(index)
+            var column = new Column(index, ColumnType.Even)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
index 223f8dae44..b9b28eb19f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
@@ -9,6 +9,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -35,7 +36,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 RelativeSizeAxes = Axes.Y,
                 TimeRange = 2000,
                 Clock = new FramedClock(clock),
-                Child = column = new Column(0)
+                Child = column = new Column(0, ColumnType.Even)
                 {
                     Action = { Value = ManiaAction.Key1 },
                     Height = 0.85f,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs b/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
index 0114987e3c..8f904530bc 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Mania.Beatmaps
 {
     public enum ColumnType
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index deb1b155b5..361210ff1d 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -46,9 +46,14 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly GameplaySampleTriggerSource sampleTriggerSource;
 
-        public Column(int index)
+        public readonly ColumnType ColumnType;
+
+        public Color4 AccentColour { get; set; }
+
+        public Column(int index, ColumnType columnType)
         {
             Index = index;
+            ColumnType = columnType;
 
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
@@ -92,12 +97,6 @@ namespace osu.Game.Rulesets.Mania.UI
             NewResult += OnNewResult;
         }
 
-        public ColumnType ColumnType { get; set; }
-
-        public bool IsSpecial => ColumnType == ColumnType.Special;
-
-        public Color4 AccentColour { get; set; }
-
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index c578bbb703..29dacc5094 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -120,13 +120,12 @@ namespace osu.Game.Rulesets.Mania.UI
             {
                 var columnType = definition.GetTypeOfColumn(i);
 
-                var column = new Column(firstColumnIndex + i)
+                var column = new Column(firstColumnIndex + i, columnType)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Width = 1,
-                    ColumnType = columnType,
                     AccentColour = columnColours[columnType],
                     Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
+                    Width = 1,
                 };
 
                 topLevelContainer.Add(column.TopLevelContainer.CreateProxy());

From 7796a4c1097c0de6e780f282db5883a49357aa18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 18:24:49 +0900
Subject: [PATCH 657/709] Cache `StageDefinition` for consumption (and remove
 `ColumnType`)

---
 .../ManiaPlacementBlueprintTestScene.cs       |  3 +-
 ...nTypeTest.cs => ManiaSpecialColumnTest.cs} | 34 +++++++++----------
 .../Skinning/ColumnTestContainer.cs           |  5 ++-
 .../TestSceneColumn.cs                        |  3 +-
 .../TestSceneDrawableManiaHitObject.cs        |  3 +-
 .../Beatmaps/ColumnType.cs                    | 12 -------
 .../Beatmaps/StageDefinition.cs               | 19 ++---------
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs |  4 +--
 .../Legacy/LegacyManiaColumnElement.cs        | 21 +++++-------
 .../Legacy/ManiaLegacySkinTransformer.cs      |  2 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          | 13 +++----
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 27 +++++++++------
 12 files changed, 61 insertions(+), 85 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{ManiaColumnTypeTest.cs => ManiaSpecialColumnTest.cs} (53%)
 delete mode 100644 osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index d6dd2664bc..976efc51b2 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -35,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
 
-            Add(column = new Column(0, ColumnType.Even)
+            Add(column = new Column(0, false)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
similarity index 53%
rename from osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs
rename to osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
index e53deb5269..c83e8a51ed 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaColumnTypeTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
@@ -10,43 +10,43 @@ using NUnit.Framework;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class ManiaColumnTypeTest
+    public class ManiaSpecialColumnTest
     {
         [TestCase(new[]
         {
-            ColumnType.Special
+            true
         }, 1)]
         [TestCase(new[]
         {
-            ColumnType.Odd,
-            ColumnType.Even,
-            ColumnType.Even,
-            ColumnType.Odd
+            false,
+            false,
+            false,
+            false
         }, 4)]
         [TestCase(new[]
         {
-            ColumnType.Odd,
-            ColumnType.Even,
-            ColumnType.Odd,
-            ColumnType.Special,
-            ColumnType.Odd,
-            ColumnType.Even,
-            ColumnType.Odd
+            false,
+            false,
+            false,
+            true,
+            false,
+            false,
+            false
         }, 7)]
-        public void Test(IEnumerable<ColumnType> expected, int columns)
+        public void Test(IEnumerable<bool> special, int columns)
         {
             var definition = new StageDefinition
             {
                 Columns = columns
             };
             var results = getResults(definition);
-            Assert.AreEqual(expected, results);
+            Assert.AreEqual(special, results);
         }
 
-        private IEnumerable<ColumnType> getResults(StageDefinition definition)
+        private IEnumerable<bool> getResults(StageDefinition definition)
         {
             for (int i = 0; i < definition.Columns; i++)
-                yield return definition.GetTypeOfColumn(i);
+                yield return definition.IsSpecialColumn(i);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index 33166c5aeb..b8d1313af5 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -24,11 +24,14 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached]
         private readonly Column column;
 
+        [Cached]
+        private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 1 };
+
         public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
         {
             InternalChildren = new[]
             {
-                this.column = new Column(column, column % 2 == 0 ? ColumnType.Even : ColumnType.Odd)
+                this.column = new Column(column, false)
                 {
                     Action = { Value = action },
                     AccentColour = Color4.Orange,
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index ab2f63339f..8fff87ae78 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -11,7 +11,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -85,7 +84,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createColumn(ScrollingDirection direction, ManiaAction action, int index)
         {
-            var column = new Column(index, ColumnType.Even)
+            var column = new Column(index, false)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
index b9b28eb19f..bd34f1ef11 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
@@ -9,7 +9,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -36,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 RelativeSizeAxes = Axes.Y,
                 TimeRange = 2000,
                 Clock = new FramedClock(clock),
-                Child = column = new Column(0, ColumnType.Even)
+                Child = column = new Column(0, false)
                 {
                     Action = { Value = ManiaAction.Key1 },
                     Height = 0.85f,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs b/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
deleted file mode 100644
index 8f904530bc..0000000000
--- a/osu.Game.Rulesets.Mania/Beatmaps/ColumnType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-namespace osu.Game.Rulesets.Mania.Beatmaps
-{
-    public enum ColumnType
-    {
-        Even,
-        Odd,
-        Special
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index 54e2d4686f..08ee97b32b 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using System;
 using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps
@@ -11,7 +10,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
     /// <summary>
     /// Defines properties for each stage in a <see cref="ManiaPlayfield"/>.
     /// </summary>
-    public struct StageDefinition
+    public class StageDefinition
     {
         /// <summary>
         /// The number of <see cref="Column"/>s which this stage contains.
@@ -23,20 +22,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// </summary>
         /// <param name="column">The 0-based column index.</param>
         /// <returns>Whether the column is a special column.</returns>
-        public readonly bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
-
-        /// <summary>
-        /// Get the type of column given a column index.
-        /// </summary>
-        /// <param name="column">The 0-based column index.</param>
-        /// <returns>The type of the column.</returns>
-        public readonly ColumnType GetTypeOfColumn(int column)
-        {
-            if (IsSpecialColumn(column))
-                return ColumnType.Special;
-
-            int distanceToEdge = Math.Min(column, (Columns - 1) - column);
-            return distanceToEdge % 2 == 0 ? ColumnType.Odd : ColumnType.Even;
-        }
+        public bool IsSpecialColumn(int column) => Columns % 2 == 1 && column == Columns / 2;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 21b362df00..6d0eb15b64 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -15,14 +15,14 @@ namespace osu.Game.Rulesets.Mania
         /// The intended <see cref="StageDefinition"/> for this component.
         /// May be null if the component is not a direct member of a <see cref="Stage"/>.
         /// </summary>
-        public readonly StageDefinition? StageDefinition;
+        public readonly StageDefinition StageDefinition;
 
         /// <summary>
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
         /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, StageDefinition? stageDefinition = null)
+        public ManiaSkinComponent(ManiaSkinComponents component, StageDefinition stageDefinition = null)
             : base(component)
         {
             StageDefinition = stageDefinition;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
index ab953ccfb9..e227c80845 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -20,6 +21,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         [Resolved]
         protected Column Column { get; private set; }
 
+        [Resolved]
+        private StageDefinition stage { get; set; }
+
         /// <summary>
         /// The column type identifier to use for texture lookups, in the case of no user-provided configuration.
         /// </summary>
@@ -28,19 +32,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load()
         {
-            switch (Column.ColumnType)
+            if (Column.IsSpecial)
+                FallbackColumnIndex = "S";
+            else
             {
-                case ColumnType.Special:
-                    FallbackColumnIndex = "S";
-                    break;
-
-                case ColumnType.Odd:
-                    FallbackColumnIndex = "1";
-                    break;
-
-                case ColumnType.Even:
-                    FallbackColumnIndex = "2";
-                    break;
+                int distanceToEdge = Math.Min(Column.Index, (stage.Columns - 1) - Column.Index);
+                FallbackColumnIndex = distanceToEdge % 2 == 0 ? "1" : "2";
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index dd5baa8150..a1b196e53e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
                         case ManiaSkinComponents.StageBackground:
                             Debug.Assert(maniaComponent.StageDefinition != null);
-                            return new LegacyStageBackground(maniaComponent.StageDefinition.Value);
+                            return new LegacyStageBackground(maniaComponent.StageDefinition);
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 361210ff1d..57ada84767 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -6,7 +6,6 @@
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -18,7 +17,6 @@ using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -26,7 +24,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Mania.UI
 {
     [Cached]
-    public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>, IHasAccentColour
+    public class Column : ScrollingPlayfield, IKeyBindingHandler<ManiaAction>
     {
         public const float COLUMN_WIDTH = 80;
         public const float SPECIAL_COLUMN_WIDTH = 70;
@@ -46,14 +44,17 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly GameplaySampleTriggerSource sampleTriggerSource;
 
-        public readonly ColumnType ColumnType;
+        /// <summary>
+        /// Whether this is a special (ie. scratch) column.
+        /// </summary>
+        public readonly bool IsSpecial;
 
         public Color4 AccentColour { get; set; }
 
-        public Column(int index, ColumnType columnType)
+        public Column(int index, bool isSpecial)
         {
             Index = index;
-            ColumnType = columnType;
+            IsSpecial = isSpecial;
 
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 29dacc5094..9e51ed84db 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -5,6 +5,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
@@ -19,7 +20,6 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -28,6 +28,9 @@ namespace osu.Game.Rulesets.Mania.UI
     /// </summary>
     public class Stage : ScrollingPlayfield
     {
+        [Cached]
+        public readonly StageDefinition Definition;
+
         public const float COLUMN_SPACING = 1;
 
         public const float HIT_TARGET_POSITION = 110;
@@ -40,12 +43,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly Drawable barLineContainer;
 
-        private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
-        {
-            { ColumnType.Even, new Color4(6, 84, 0, 255) },
-            { ColumnType.Odd, new Color4(94, 0, 57, 255) },
-            { ColumnType.Special, new Color4(0, 48, 63, 255) }
-        };
+        // private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
+        // {
+        //     { ColumnType.Even, new Color4(6, 84, 0, 255) },
+        //     { ColumnType.Odd, new Color4(94, 0, 57, 255) },
+        //     { ColumnType.Special, new Color4(0, 48, 63, 255) }
+        // };
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Columns.Any(c => c.ReceivePositionalInputAt(screenSpacePos));
 
@@ -54,6 +57,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public Stage(int firstColumnIndex, StageDefinition definition, ref ManiaAction normalColumnStartAction, ref ManiaAction specialColumnStartAction)
         {
             this.firstColumnIndex = firstColumnIndex;
+            Definition = definition;
 
             Name = "Stage";
 
@@ -118,14 +122,15 @@ namespace osu.Game.Rulesets.Mania.UI
 
             for (int i = 0; i < definition.Columns; i++)
             {
-                var columnType = definition.GetTypeOfColumn(i);
+                bool isSpecial = definition.IsSpecialColumn(i);
 
-                var column = new Column(firstColumnIndex + i, columnType)
+                var column = new Column(firstColumnIndex + i, isSpecial)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    AccentColour = columnColours[columnType],
-                    Action = { Value = columnType == ColumnType.Special ? specialColumnStartAction++ : normalColumnStartAction++ }
                     Width = 1,
+                    // TODO: reimplement this somewhere.
+                    //AccentColour = columnColours[isSpecial],
+                    Action = { Value = isSpecial ? specialColumnStartAction++ : normalColumnStartAction++ }
                 };
 
                 topLevelContainer.Add(column.TopLevelContainer.CreateProxy());

From 46c3cfe54d6a772b82c0a76f969627b3c408f30b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 18:26:27 +0900
Subject: [PATCH 658/709] Remove `StageDefinition` flow in `ManiaSkinComponent`

---
 .../Skinning/TestSceneStageBackground.cs             |  3 +--
 .../Skinning/TestSceneStageForeground.cs             |  3 +--
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs        | 12 +-----------
 .../Skinning/Legacy/LegacyStageBackground.cs         |  7 ++-----
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs    |  4 +---
 osu.Game.Rulesets.Mania/UI/Stage.cs                  |  4 ++--
 6 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
index 687b3a747d..0744d7e2e7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageBackground.cs
@@ -5,7 +5,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Skinning;
 
@@ -16,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(_ => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: new StageDefinition { Columns = 4 }),
+            SetContents(_ => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground),
                 _ => new DefaultStageBackground())
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
index 6cbc172755..979c90c802 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStageForeground.cs
@@ -5,7 +5,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
@@ -15,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(_ => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: new StageDefinition { Columns = 4 }), _ => null)
+            SetContents(_ => new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index 6d0eb15b64..f05edb4677 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -3,29 +3,19 @@
 
 #nullable disable
 
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania
 {
     public class ManiaSkinComponent : GameplaySkinComponent<ManiaSkinComponents>
     {
-        /// <summary>
-        /// The intended <see cref="StageDefinition"/> for this component.
-        /// May be null if the component is not a direct member of a <see cref="Stage"/>.
-        /// </summary>
-        public readonly StageDefinition StageDefinition;
-
         /// <summary>
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
-        /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, StageDefinition stageDefinition = null)
+        public ManiaSkinComponent(ManiaSkinComponents component)
             : base(component)
         {
-            StageDefinition = stageDefinition;
         }
 
         protected override string RulesetPrefix => ManiaRuleset.SHORT_NAME;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
index 740ccbfe27..d039551cd7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
@@ -18,20 +18,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyStageBackground : CompositeDrawable
     {
-        private readonly StageDefinition stageDefinition;
-
         private Drawable leftSprite;
         private Drawable rightSprite;
         private ColumnFlow<Drawable> columnBackgrounds;
 
-        public LegacyStageBackground(StageDefinition stageDefinition)
+        public LegacyStageBackground()
         {
-            this.stageDefinition = stageDefinition;
             RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, StageDefinition stageDefinition)
         {
             string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
                                ?? "mania-stage-left";
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index a1b196e53e..5ecdf988f9 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -113,8 +112,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                             return new LegacyHitExplosion();
 
                         case ManiaSkinComponents.StageBackground:
-                            Debug.Assert(maniaComponent.StageDefinition != null);
-                            return new LegacyStageBackground(maniaComponent.StageDefinition);
+                            return new LegacyStageBackground();
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 9e51ed84db..a19d423e69 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.UI
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground, stageDefinition: definition), _ => new DefaultStageBackground())
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageBackground), _ => new DefaultStageBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Mania.UI
                                 RelativeSizeAxes = Axes.Y,
                             }
                         },
-                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground, stageDefinition: definition), _ => null)
+                        new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.StageForeground), _ => null)
                         {
                             RelativeSizeAxes = Axes.Both
                         },

From 9c979044dcd93f53cb86be594b8b6da3f382761c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 19:27:16 +0900
Subject: [PATCH 659/709] Move `AccentColour` assignment to inside `Column`

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 42 ++++++++++++++++++----------
 osu.Game.Rulesets.Mania/UI/Stage.cs  |  2 --
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 57ada84767..c0739f5ec3 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -3,23 +3,24 @@
 
 #nullable disable
 
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.UI;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -37,12 +38,12 @@ namespace osu.Game.Rulesets.Mania.UI
         public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
 
         public readonly ColumnHitObjectArea HitObjectArea;
-        internal readonly Container TopLevelContainer;
-        private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
+        internal readonly Container TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both };
+        private DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
-        private readonly GameplaySampleTriggerSource sampleTriggerSource;
+        private GameplaySampleTriggerSource sampleTriggerSource;
 
         /// <summary>
         /// Whether this is a special (ie. scratch) column.
@@ -59,6 +60,21 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
 
+            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+            HitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            // TODO: reimplement this somewhere.
+            AccentColour = skin.GetConfig<ManiaSkinColour, Color4>()
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+
+            //AccentColour = columnColours[isSpecial],
+            foreach (var obj in HitObjectContainer.Objects)
+                obj.AccentColour.Value = AccentColour;
+
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
@@ -70,18 +86,16 @@ namespace osu.Game.Rulesets.Mania.UI
                 sampleTriggerSource = new GameplaySampleTriggerSource(HitObjectContainer),
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
-                HitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both },
+                HitObjectArea,
                 new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
-                TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both },
+                TopLevelContainer,
                 new ColumnTouchInputArea(this)
             };
 
-            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
-
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index a19d423e69..52c8829df3 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -128,8 +128,6 @@ namespace osu.Game.Rulesets.Mania.UI
                 {
                     RelativeSizeAxes = Axes.Both,
                     Width = 1,
-                    // TODO: reimplement this somewhere.
-                    //AccentColour = columnColours[isSpecial],
                     Action = { Value = isSpecial ? specialColumnStartAction++ : normalColumnStartAction++ }
                 };
 

From 5c48d8931ad8dc5e7ba36cd06bcaf84052a77615 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 19:42:43 +0900
Subject: [PATCH 660/709] Add `StageDefinition` to
 `ManiaSkinConfigurationLookup` and make column background colour lookup work

---
 .../Argon/ManiaArgonSkinTransformer.cs        | 24 +++++++++++++++++++
 .../Legacy/HitTargetInsetContainer.cs         |  5 ++--
 .../Skinning/Legacy/LegacyColumnBackground.cs |  5 ++--
 .../Skinning/Legacy/LegacyHitTarget.cs        |  9 +++----
 .../Legacy/LegacyManiaColumnElement.cs        |  2 +-
 .../Legacy/LegacyManiaJudgementPiece.cs       |  5 ++--
 .../Skinning/Legacy/LegacyNotePiece.cs        |  5 ++--
 .../Skinning/Legacy/LegacyStageBackground.cs  | 14 +++++------
 .../Skinning/Legacy/LegacyStageForeground.cs  |  5 ++--
 .../Legacy/ManiaLegacySkinTransformer.cs      |  6 ++---
 .../Skinning/ManiaSkinConfigExtensions.cs     |  8 ++++---
 .../Skinning/ManiaSkinConfigurationLookup.cs  | 16 +++++++++----
 osu.Game.Rulesets.Mania/UI/Column.cs          |  9 ++++---
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs      |  4 ++--
 .../UI/Components/HitObjectArea.cs            |  6 ++++-
 15 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index ec6aaf2ef7..57a317e87d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -1,8 +1,11 @@
 // 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.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
@@ -33,5 +36,26 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
             return base.GetDrawableComponent(component);
         }
+
+        public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            if (lookup is ManiaSkinConfigurationLookup maniaLookup)
+            {
+                switch (maniaLookup.Lookup)
+                {
+                    case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                        if (maniaLookup.StageDefinition.IsSpecialColumn(maniaLookup.ColumnIndex ?? 0))
+                            return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Yellow));
+
+                        // TODO: Add actual colours.
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(new Color4(RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, 1)));
+                }
+
+                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(maniaLookup.StageDefinition.Columns, maniaLookup.Lookup,
+                    maniaLookup.ColumnIndex));
+            }
+
+            return base.GetConfig<TLookup, TValue>(lookup);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
index 362a265789..de6d048295 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -30,9 +31,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
         {
-            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
+            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition, stageDefinition)?.Value ?? Stage.HIT_TARGET_POSITION;
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index f35cedab08..08fa9b9a73 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -30,9 +31,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
         {
-            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
+            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage, stageDefinition)?.Value
                                 ?? "mania-stage-light";
 
             float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
index 611dac30b3..9819f09e10 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -23,15 +24,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private Container directionContainer;
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
         {
-            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
+            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage, stageDefinition)?.Value
                                  ?? "mania-stage-hint";
 
-            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
+            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine, stageDefinition)?.Value
                                      ?? true;
 
-            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
+            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour, stageDefinition)?.Value
                                 ?? Color4.White;
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
index e227c80845..cfebad4add 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
@@ -42,6 +42,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         protected IBindable<T> GetColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
-            => skin.GetManiaSkinConfig<T>(lookup, Column.Index);
+            => skin.GetManiaSkinConfig<T>(lookup, stage, Column.Index);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index d09a73a693..f9653dab15 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -32,9 +33,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, StageDefinition stageDefinition)
         {
-            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value;
+            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition, stageDefinition)?.Value;
 
             if (scorePosition != null)
                 scorePosition -= Stage.HIT_TARGET_POSITION + 150;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
index 41e149ea2f..779e1a152c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -35,9 +36,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
         {
-            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth))?.Value;
+            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth, stageDefinition))?.Value;
 
             InternalChild = directionContainer = new Container
             {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
index d039551cd7..01c2b599fa 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
@@ -30,10 +30,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, StageDefinition stageDefinition)
         {
-            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
+            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage, stageDefinition)?.Value
                                ?? "mania-stage-left";
 
-            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
+            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage, stageDefinition)?.Value
                                 ?? "mania-stage-right";
 
             InternalChildren = new[]
@@ -91,16 +91,16 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             }
 
             [BackgroundDependencyLoader]
-            private void load(ISkinSource skin)
+            private void load(ISkinSource skin, StageDefinition stageDefinition)
             {
-                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, columnIndex)?.Value ?? 1;
-                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, columnIndex)?.Value ?? 1;
+                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, stageDefinition, columnIndex)?.Value ?? 1;
+                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, stageDefinition, columnIndex)?.Value ?? 1;
 
                 bool hasLeftLine = leftLineWidth > 0;
                 bool hasRightLine = (rightLineWidth > 0 && skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value >= 2.4m) || isLastColumn;
 
-                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, columnIndex)?.Value ?? Color4.White;
-                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, columnIndex)?.Value ?? Color4.Black;
+                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, stageDefinition, columnIndex)?.Value ?? Color4.White;
+                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, columnIndex)?.Value ?? Color4.Black;
 
                 InternalChildren = new Drawable[]
                 {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
index f7c611d551..57b76c5402 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -25,9 +26,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
         {
-            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
+            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage, stageDefinition)?.Value
                                  ?? "mania-stage-bottom";
 
             sprite = skin.GetAnimation(bottomImage, true, true)?.With(d =>
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 5ecdf988f9..352b205c0b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
             {
-                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value ?? "mania-key1";
+                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition(), 0)?.Value ?? "mania-key1";
                 return this.GetAnimation(keyImage, true, true) != null;
             });
         }
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             if (!hit_result_mapping.ContainsKey(result))
                 return null;
 
-            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
+            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result], new StageDefinition())?.Value
                               ?? default_hit_result_skin_filenames[result];
 
             var animation = this.GetAnimation(filename, true, true);
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.TargetColumn));
+                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
 
             return base.GetConfig<TLookup, TValue>(lookup);
         }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
index 4d0c321116..541b679043 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Framework.Bindables;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
@@ -15,9 +16,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         /// <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>
-        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? index = null)
+        /// <param name="stageDefinition">The stage definition.</param>
+        /// <param name="columnIndex">If not null, denotes the index of the column to which the entry applies.</param>
+        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, StageDefinition stageDefinition, int? columnIndex = null)
             => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
-                new ManiaSkinConfigurationLookup(lookup, index));
+                new ManiaSkinConfigurationLookup(lookup, stageDefinition, columnIndex));
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index e9005a3da0..8008c988d4 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
@@ -15,21 +16,28 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
 
+        /// <summary>
+        /// The stage containing the component which is performing this lookup.
+        /// </summary>
+        public readonly StageDefinition StageDefinition;
+
         /// <summary>
         /// The intended <see cref="Column"/> index for the configuration.
         /// May be null if the configuration does not apply to a <see cref="Column"/>.
         /// </summary>
-        public readonly int? TargetColumn;
+        public readonly int? ColumnIndex;
 
         /// <summary>
         /// Creates a new <see cref="ManiaSkinConfigurationLookup"/>.
         /// </summary>
         /// <param name="lookup">The lookup value.</param>
-        /// <param name="targetColumn">The intended <see cref="Column"/> index for the configuration. May be null if the configuration does not apply to a <see cref="Column"/>.</param>
-        public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+        /// <param name="stageDefinition">The stage definition.</param>
+        /// <param name="columnIndex">The intended <see cref="Column"/> index for the configuration. May be null if the configuration does not apply to a <see cref="Column"/>.</param>
+        public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, StageDefinition stageDefinition, int? columnIndex = null)
         {
             Lookup = lookup;
-            TargetColumn = targetColumn;
+            StageDefinition = stageDefinition;
+            ColumnIndex = columnIndex;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index c0739f5ec3..75d6d4c206 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -10,10 +10,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -65,11 +66,9 @@ namespace osu.Game.Rulesets.Mania.UI
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load(ISkinSource skin, StageDefinition stageDefinition)
         {
-            // TODO: reimplement this somewhere.
-            AccentColour = skin.GetConfig<ManiaSkinColour, Color4>()
-            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            AccentColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
 
             //AccentColour = columnColours[isSpecial],
             foreach (var obj in HitObjectContainer.Objects)
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 871ec9f1a3..bde2308635 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -65,14 +65,14 @@ namespace osu.Game.Rulesets.Mania.UI
                 if (i > 0)
                 {
                     float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, stageDefinition, i - 1))
                                                ?.Value ?? Stage.COLUMN_SPACING;
 
                     columns[i].Margin = new MarginPadding { Left = spacing };
                 }
 
                 float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, stageDefinition, i))
                                           ?.Value;
 
                 if (width == null)
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index 7f4b8eacde..69bf146951 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -19,6 +20,9 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
         public readonly HitObjectContainer HitObjectContainer;
 
+        [Resolved]
+        private StageDefinition stageDefinition { get; set; }
+
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChild = new Container
@@ -49,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         protected virtual void UpdateHitPosition()
         {
             float hitPosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
+                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition, stageDefinition))?.Value
                                 ?? Stage.HIT_TARGET_POSITION;
 
             Padding = Direction.Value == ScrollingDirection.Up

From 1a0b953846f2ac67acfd93f228cc64e7efcd666d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 19:49:07 +0900
Subject: [PATCH 661/709] Remove unnecessary `Beatmap` parameter in
 `ManiaLegacySkinTransformer`

---
 .../Skinning/ColumnTestContainer.cs                   |  2 +-
 osu.Game.Rulesets.Mania/ManiaRuleset.cs               |  2 +-
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs     | 11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index b8d1313af5..8f6a8c42b1 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private readonly Column column;
 
         [Cached]
-        private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 1 };
+        private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 2 };
 
         public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
         {
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c6b20b1baf..746dda6733 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Mania
             switch (skin)
             {
                 case LegacySkin:
-                    return new ManiaLegacySkinTransformer(skin, beatmap);
+                    return new ManiaLegacySkinTransformer(skin);
 
                 case ArgonSkin:
                     return new ManiaArgonSkinTransformer(skin);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 352b205c0b..0a59c10b5f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring;
@@ -19,8 +18,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class ManiaLegacySkinTransformer : LegacySkinTransformer
     {
-        private readonly ManiaBeatmap beatmap;
-
         /// <summary>
         /// Mapping of <see cref="HitResult"/> to their corresponding
         /// <see cref="LegacyManiaSkinConfigurationLookups"/> value.
@@ -59,15 +56,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         /// </summary>
         private readonly Lazy<bool> hasKeyTexture;
 
-        public ManiaLegacySkinTransformer(ISkin skin, IBeatmap beatmap)
+        public ManiaLegacySkinTransformer(ISkin skin)
             : base(skin)
         {
-            this.beatmap = (ManiaBeatmap)beatmap;
-
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
             {
-                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition(), 0)?.Value ?? "mania-key1";
+                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition { Columns = 1 }, 0)?.Value ?? "mania-key1";
                 return this.GetAnimation(keyImage, true, true) != null;
             });
         }
@@ -149,7 +144,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
+                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(maniaLookup.StageDefinition.Columns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
 
             return base.GetConfig<TLookup, TValue>(lookup);
         }

From 5fe9b953a526447234ed3d83017bc8f259e99e7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Oct 2022 19:50:55 +0900
Subject: [PATCH 662/709] Add back triangles column colours via a transformer

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  4 ++
 .../Argon/ManiaArgonSkinTransformer.cs        |  3 --
 .../Default/ManiaTrianglesSkinTransformer.cs  | 42 +++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 746dda6733..7be4243ad6 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Mania.Skinning.Argon;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Mania.Skinning.Legacy;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -67,6 +68,9 @@ namespace osu.Game.Rulesets.Mania
         {
             switch (skin)
             {
+                case TrianglesSkin:
+                    return new ManiaTrianglesSkinTransformer(skin);
+
                 case LegacySkin:
                     return new ManiaLegacySkinTransformer(skin);
 
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 57a317e87d..ea34d8d4c5 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -50,9 +50,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         // TODO: Add actual colours.
                         return SkinUtils.As<TValue>(new Bindable<Color4>(new Color4(RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, 1)));
                 }
-
-                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(maniaLookup.StageDefinition.Columns, maniaLookup.Lookup,
-                    maniaLookup.ColumnIndex));
             }
 
             return base.GetConfig<TLookup, TValue>(lookup);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
new file mode 100644
index 0000000000..88f1f6ed26
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
@@ -0,0 +1,42 @@
+// 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 osu.Framework.Bindables;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Default
+{
+    public class ManiaTrianglesSkinTransformer : SkinTransformer
+    {
+        public ManiaTrianglesSkinTransformer(ISkin skin)
+            : base(skin)
+        {
+        }
+
+        private readonly Color4 colourEven = new Color4(6, 84, 0, 255);
+        private readonly Color4 colourOdd = new Color4(94, 0, 57, 255);
+        private readonly Color4 colourSpecial = new Color4(0, 48, 63, 255);
+
+        public override IBindable<TValue>? GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            if (lookup is ManiaSkinConfigurationLookup maniaLookup)
+            {
+                switch (maniaLookup.Lookup)
+                {
+                    case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                        int column = maniaLookup.ColumnIndex ?? 0;
+
+                        if (maniaLookup.StageDefinition.IsSpecialColumn(column))
+                            return SkinUtils.As<TValue>(new Bindable<Color4>(colourSpecial));
+
+                        int distanceToEdge = Math.Min(column, (maniaLookup.StageDefinition.Columns - 1) - column);
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(distanceToEdge % 2 == 0 ? colourOdd : colourEven));
+                }
+            }
+
+            return base.GetConfig<TLookup, TValue>(lookup);
+        }
+    }
+}

From 2ae1aef0be4252e8b3bc98d61eea057ad7083d14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 19:14:31 +0900
Subject: [PATCH 663/709] Move column initialisation to ctor and fix remaining
 tests

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs     |  4 ++++
 .../Editor/ManiaSelectionBlueprintTestScene.cs     |  2 +-
 .../Editor/TestSceneManiaBeatSnapGrid.cs           |  6 +++---
 .../Editor/TestSceneManiaComposeScreen.cs          |  2 +-
 .../Editor/TestSceneManiaHitObjectComposer.cs      |  2 +-
 .../ManiaLegacyReplayTest.cs                       |  6 +++---
 .../ManiaSpecialColumnTest.cs                      |  5 +----
 .../Mods/TestSceneManiaModHoldOff.cs               |  2 +-
 .../Skinning/ColumnTestContainer.cs                |  2 +-
 .../Skinning/ManiaSkinnableTestScene.cs            |  4 ++++
 .../Skinning/TestSceneBarLine.cs                   |  2 +-
 .../Skinning/TestScenePlayfield.cs                 |  6 +++---
 .../Skinning/TestSceneStage.cs                     |  2 +-
 .../TestSceneAutoGeneration.cs                     | 14 +++++++-------
 osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs   |  4 ++++
 .../TestSceneDrawableManiaHitObject.cs             |  5 +++++
 .../TestSceneOutOfOrderHits.cs                     |  2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs    |  2 +-
 .../TestSceneTimingBasedNoteColouring.cs           |  2 +-
 .../Beatmaps/ManiaBeatmapConverter.cs              |  4 ++--
 .../Beatmaps/StageDefinition.cs                    | 11 ++++++++++-
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs  |  4 ++--
 22 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 976efc51b2..a759e95d17 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -30,6 +31,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
+        [Cached]
+        private readonly StageDefinition stage = new StageDefinition(5);
+
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 679a15e8cb..4cadcf138b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         protected ManiaSelectionBlueprintTestScene(int columns)
         {
-            var stageDefinitions = new List<StageDefinition> { new StageDefinition { Columns = columns } };
+            var stageDefinitions = new List<StageDefinition> { new StageDefinition(columns) };
             base.Content.Child = scrollingTestContainer = new ScrollingTestContainer(ScrollingDirection.Up)
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
index ec96205067..ef140995ec 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaBeatSnapGrid.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private ScrollingTestContainer.TestScrollingInfo scrollingInfo = new ScrollingTestContainer.TestScrollingInfo();
 
         [Cached(typeof(EditorBeatmap))]
-        private EditorBeatmap editorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition())
+        private EditorBeatmap editorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition(2))
         {
             BeatmapInfo =
             {
@@ -56,8 +56,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             {
                 Playfield = new ManiaPlayfield(new List<StageDefinition>
                 {
-                    new StageDefinition { Columns = 4 },
-                    new StageDefinition { Columns = 3 }
+                    new StageDefinition(4),
+                    new StageDefinition(3)
                 })
                 {
                     Clock = new FramedClock(new StopwatchClock())
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
index e96a186ae4..e082b90d3b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaComposeScreen.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         {
             AddStep("setup compose screen", () =>
             {
-                var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 4 })
+                var beatmap = new ManiaBeatmap(new StageDefinition(4))
                 {
                     BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
                 };
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index fcc9e2e6c3..a3985be936 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             {
                 InternalChildren = new Drawable[]
                 {
-                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 })
+                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition(4))
                     {
                         BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
                     }),
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
index b64006316e..7d1a934456 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaLegacyReplayTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase(ManiaAction.Key8)]
         public void TestEncodeDecodeSingleStage(params ManiaAction[] actions)
         {
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 9 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(9));
 
             var frame = new ManiaReplayFrame(0, actions);
             var legacyFrame = frame.ToLegacy(beatmap);
@@ -38,8 +38,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         [TestCase(ManiaAction.Key8)]
         public void TestEncodeDecodeDualStage(params ManiaAction[] actions)
         {
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 5 });
-            beatmap.Stages.Add(new StageDefinition { Columns = 5 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(5));
+            beatmap.Stages.Add(new StageDefinition(5));
 
             var frame = new ManiaReplayFrame(0, actions);
             var legacyFrame = frame.ToLegacy(beatmap);
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
index c83e8a51ed..3bd654e75e 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSpecialColumnTest.cs
@@ -35,10 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         }, 7)]
         public void Test(IEnumerable<bool> special, int columns)
         {
-            var definition = new StageDefinition
-            {
-                Columns = columns
-            };
+            var definition = new StageDefinition(columns);
             var results = getResults(definition);
             Assert.AreEqual(special, results);
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
index 7970d5b594..d27a79c41d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModHoldOff.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         private static ManiaBeatmap createRawBeatmap()
         {
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(1));
             beatmap.ControlPointInfo.Add(0.0, new TimingControlPoint { BeatLength = 1000 }); // Set BPM to 60
 
             // Add test hit objects
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index 8f6a8c42b1..6fdf32dfbe 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private readonly Column column;
 
         [Cached]
-        private readonly StageDefinition stageDefinition = new StageDefinition { Columns = 2 };
+        private readonly StageDefinition stageDefinition = new StageDefinition(5);
 
         public ColumnTestContainer(int column, ManiaAction action, bool showColumn = false)
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 9f235689b4..2c5535a65f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +25,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        [Cached]
+        private readonly StageDefinition stage = new StageDefinition(4);
+
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs
index ff557638a9..1bfe55b074 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         {
             var stageDefinitions = new List<StageDefinition>
             {
-                new StageDefinition { Columns = 4 },
+                new StageDefinition(4),
             };
 
             SetContents(_ => new ManiaPlayfield(stageDefinitions).With(s =>
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
index 62dadbc3dd..9817719c94 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestScenePlayfield.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             {
                 stageDefinitions = new List<StageDefinition>
                 {
-                    new StageDefinition { Columns = 2 }
+                    new StageDefinition(2)
                 };
 
                 SetContents(_ => new ManiaPlayfield(stageDefinitions));
@@ -36,8 +36,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             {
                 stageDefinitions = new List<StageDefinition>
                 {
-                    new StageDefinition { Columns = 2 },
-                    new StageDefinition { Columns = 2 }
+                    new StageDefinition(2),
+                    new StageDefinition(2)
                 };
 
                 SetContents(_ => new ManiaPlayfield(stageDefinitions));
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
index f3f1b9416f..07aa0b845f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneStage.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
                 return new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
                 {
-                    Child = new Stage(0, new StageDefinition { Columns = 4 }, ref normalAction, ref specialAction)
+                    Child = new Stage(0, new StageDefinition(4), ref normalAction, ref specialAction)
                 };
             });
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index 21ec85bbe6..3abeb8a5f6 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | - |
             // |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(1));
             beatmap.HitObjects.Add(new Note { StartTime = 1000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | * |
             // |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(1));
             beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | - | - |
             // |   |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(2));
             beatmap.HitObjects.Add(new Note { StartTime = 1000 });
             beatmap.HitObjects.Add(new Note { StartTime = 1000, Column = 1 });
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | * | * |
             // |   |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(2));
             beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
             beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000, Column = 1 });
 
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | - |   |
             // |   |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(2));
             beatmap.HitObjects.Add(new Note { StartTime = 1000 });
             beatmap.HitObjects.Add(new Note { StartTime = 2000, Column = 1 });
 
@@ -142,7 +142,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | * |   |
             // |   |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(2));
             beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
             beatmap.HitObjects.Add(new HoldNote { StartTime = 2000, Duration = 2000, Column = 1 });
 
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // | * |   |
             // |   |   |
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
+            var beatmap = new ManiaBeatmap(new StageDefinition(2));
             beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
             beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 8fff87ae78..3bac3c7650 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -28,6 +29,9 @@ namespace osu.Game.Rulesets.Mania.Tests
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
+        [Cached]
+        private readonly StageDefinition stage = new StageDefinition(1);
+
         private readonly List<Column> columns = new List<Column>();
 
         public TestSceneColumn()
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
index bd34f1ef11..ea033082a7 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
@@ -4,11 +4,13 @@
 #nullable disable
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
@@ -24,6 +26,9 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Column column;
 
+        [Cached]
+        private readonly StageDefinition stage = new StageDefinition(1);
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index a563dc3106..1f139b5b78 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             AddStep("load player", () =>
             {
-                Beatmap.Value = CreateWorkingBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 })
+                Beatmap.Value = CreateWorkingBeatmap(new ManiaBeatmap(new StageDefinition(4))
                 {
                     HitObjects = hitObjects,
                     BeatmapInfo =
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index cf8947c1ed..6387dac957 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var specialAction = ManiaAction.Special1;
 
-            var stage = new Stage(0, new StageDefinition { Columns = 2 }, ref action, ref specialAction);
+            var stage = new Stage(0, new StageDefinition(2), ref action, ref specialAction);
             stages.Add(stage);
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
index e84d02775a..9f2e3d2502 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             const double beat_length = 500;
 
-            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 })
+            var beatmap = new ManiaBeatmap(new StageDefinition(1))
             {
                 HitObjects =
                 {
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 90cd7f57b5..632b7cdcc7 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -93,10 +93,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
         protected override Beatmap<ManiaHitObject> CreateBeatmap()
         {
-            beatmap = new ManiaBeatmap(new StageDefinition { Columns = TargetColumns }, originalTargetColumns);
+            beatmap = new ManiaBeatmap(new StageDefinition(TargetColumns), originalTargetColumns);
 
             if (Dual)
-                beatmap.Stages.Add(new StageDefinition { Columns = TargetColumns });
+                beatmap.Stages.Add(new StageDefinition(TargetColumns));
 
             return beatmap;
         }
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
index 08ee97b32b..898b558eb3 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/StageDefinition.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps
@@ -15,7 +16,15 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
         /// <summary>
         /// The number of <see cref="Column"/>s which this stage contains.
         /// </summary>
-        public int Columns;
+        public readonly int Columns;
+
+        public StageDefinition(int columns)
+        {
+            if (columns < 1)
+                throw new ArgumentException("Column count must be above zero.", nameof(columns));
+
+            Columns = columns;
+        }
 
         /// <summary>
         /// Whether the column index is a special column for this stage.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 0a59c10b5f..1c06f3cffb 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
             {
-                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition { Columns = 1 }, 0)?.Value ?? "mania-key1";
+                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition(1), 0)?.Value ?? "mania-key1";
                 return this.GetAnimation(keyImage, true, true) != null;
             });
         }
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             if (!hit_result_mapping.ContainsKey(result))
                 return null;
 
-            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result], new StageDefinition())?.Value
+            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result], new StageDefinition(1))?.Value
                               ?? default_hit_result_skin_filenames[result];
 
             var animation = this.GetAnimation(filename, true, true);

From 3947011baf594cec7b6f7ab4984f22d75e5305b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 19:21:38 +0900
Subject: [PATCH 664/709] Fix regression in legacy dual stage handling logic

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs              |  6 +++---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs    |  9 +++++++--
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs   | 12 +++++++-----
 osu.Game/Skinning/LegacySkin.cs                      |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 7be4243ad6..9d2182f276 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -71,11 +71,11 @@ namespace osu.Game.Rulesets.Mania
                 case TrianglesSkin:
                     return new ManiaTrianglesSkinTransformer(skin);
 
-                case LegacySkin:
-                    return new ManiaLegacySkinTransformer(skin);
-
                 case ArgonSkin:
                     return new ManiaArgonSkinTransformer(skin);
+
+                case LegacySkin:
+                    return new ManiaLegacySkinTransformer(skin, beatmap);
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 1c06f3cffb..5a0478f025 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring;
@@ -56,9 +57,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         /// </summary>
         private readonly Lazy<bool> hasKeyTexture;
 
-        public ManiaLegacySkinTransformer(ISkin skin)
+        private readonly ManiaBeatmap beatmap;
+
+        public ManiaLegacySkinTransformer(ISkin skin, IBeatmap beatmap)
             : base(skin)
         {
+            this.beatmap = (ManiaBeatmap)beatmap;
+
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
             {
@@ -144,7 +149,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(maniaLookup.StageDefinition.Columns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
+                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
 
             return base.GetConfig<TLookup, TValue>(lookup);
         }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 45454be4a5..8e786c96d9 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -1,19 +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.
 
-#nullable disable
-
 namespace osu.Game.Skinning
 {
     public class LegacyManiaSkinConfigurationLookup
     {
-        public readonly int Keys;
+        /// <summary>
+        /// Total columns across all stages.
+        /// </summary>
+        public readonly int TotalColumns;
+
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
         public readonly int? TargetColumn;
 
-        public LegacyManiaSkinConfigurationLookup(int keys, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+        public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
         {
-            Keys = keys;
+            TotalColumns = totalColumns;
             Lookup = lookup;
             TargetColumn = targetColumn;
         }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 1e096702b3..e1a630b643 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -128,8 +128,8 @@ namespace osu.Game.Skinning
 
         private IBindable<TValue>? lookupForMania<TValue>(LegacyManiaSkinConfigurationLookup maniaLookup)
         {
-            if (!maniaConfigurations.TryGetValue(maniaLookup.Keys, out var existing))
-                maniaConfigurations[maniaLookup.Keys] = existing = new LegacyManiaSkinConfiguration(maniaLookup.Keys);
+            if (!maniaConfigurations.TryGetValue(maniaLookup.TotalColumns, out var existing))
+                maniaConfigurations[maniaLookup.TotalColumns] = existing = new LegacyManiaSkinConfiguration(maniaLookup.TotalColumns);
 
             switch (maniaLookup.Lookup)
             {

From 276395f1afebe3902aa57245a4ccddd65b52d1cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 19:51:18 +0900
Subject: [PATCH 665/709] Fix column colour not updating on skin change

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 31 +++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 75d6d4c206..8c50ab919b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -65,14 +65,17 @@ namespace osu.Game.Rulesets.Mania.UI
             HitObjectArea = new ColumnHitObjectArea(HitObjectContainer) { RelativeSizeAxes = Axes.Both };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, StageDefinition stageDefinition)
-        {
-            AccentColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
+        [Resolved]
+        private ISkinSource skin { get; set; }
 
-            //AccentColour = columnColours[isSpecial],
-            foreach (var obj in HitObjectContainer.Objects)
-                obj.AccentColour.Value = AccentColour;
+        [Resolved]
+        private StageDefinition stageDefinition { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            skin.SourceChanged += onSourceChanged;
+            onSourceChanged();
 
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
@@ -104,13 +107,25 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
         }
 
+        private void onSourceChanged()
+        {
+            AccentColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
+            foreach (var obj in HitObjectContainer.Objects)
+                obj.AccentColour.Value = AccentColour;
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             NewResult += OnNewResult;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            skin.SourceChanged += onSourceChanged;
+        }
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));

From 532d101080e04405149a43c873f99aa4ba10dd5e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 19:58:39 +0900
Subject: [PATCH 666/709] Remove unused class

---
 .../UI/Components/ColumnBackground.cs         | 110 ------------------
 1 file changed, 110 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs

diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
deleted file mode 100644
index 5bd2d3ab48..0000000000
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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.
-
-#nullable disable
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Rulesets.UI.Scrolling;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI.Components
-{
-    public class ColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>, IHasAccentColour
-    {
-        private readonly IBindable<ManiaAction> action = new Bindable<ManiaAction>();
-
-        private Box background;
-        private Box backgroundOverlay;
-
-        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
-
-        [BackgroundDependencyLoader]
-        private void load(IBindable<ManiaAction> action, IScrollingInfo scrollingInfo)
-        {
-            this.action.BindTo(action);
-
-            InternalChildren = new[]
-            {
-                background = new Box
-                {
-                    Name = "Background",
-                    RelativeSizeAxes = Axes.Both,
-                },
-                backgroundOverlay = new Box
-                {
-                    Name = "Background Gradient Overlay",
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0
-                }
-            };
-
-            direction.BindTo(scrollingInfo.Direction);
-            direction.BindValueChanged(dir =>
-            {
-                backgroundOverlay.Anchor = backgroundOverlay.Origin = dir.NewValue == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
-                updateColours();
-            }, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateColours();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateColours();
-            }
-        }
-
-        private void updateColours()
-        {
-            if (!IsLoaded)
-                return;
-
-            background.Colour = AccentColour.Darken(5);
-
-            var brightPoint = AccentColour.Opacity(0.6f);
-            var dimPoint = AccentColour.Opacity(0);
-
-            backgroundOverlay.Colour = ColourInfo.GradientVertical(
-                direction.Value == ScrollingDirection.Up ? brightPoint : dimPoint,
-                direction.Value == ScrollingDirection.Up ? dimPoint : brightPoint);
-        }
-
-        public bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
-        {
-            if (e.Action == action.Value)
-                backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
-            return false;
-        }
-
-        public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
-        {
-            if (e.Action == action.Value)
-                backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
-        }
-    }
-}

From 6b79f164612c9d4a9608650d4954d82e06b84773 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 20:02:02 +0900
Subject: [PATCH 667/709] Make `Column.AccentColour` bindable

---
 .../ManiaPlacementBlueprintTestScene.cs       |  2 +-
 .../Skinning/ColumnTestContainer.cs           |  2 +-
 .../TestSceneColumn.cs                        |  2 +-
 .../TestSceneDrawableManiaHitObject.cs        |  2 +-
 .../Skinning/Argon/ArgonKeyArea.cs            | 23 +++---
 osu.Game.Rulesets.Mania/UI/Column.cs          | 15 ++--
 .../UI/Components/DefaultColumnBackground.cs  | 12 +++-
 .../UI/Components/DefaultHitTarget.cs         | 16 +++--
 .../UI/Components/DefaultKeyArea.cs           | 20 ++++--
 .../UI/DefaultHitExplosion.cs                 | 71 ++++++++++---------
 10 files changed, 101 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index a759e95d17..0e4f612999 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AccentColour = Color4.OrangeRed,
+                AccentColour = { Value = Color4.OrangeRed },
                 Clock = new FramedClock(new StopwatchClock()), // No scroll
             });
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index 6fdf32dfbe..cefcce8319 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 this.column = new Column(column, false)
                 {
                     Action = { Value = action },
-                    AccentColour = Color4.Orange,
+                    AccentColour = { Value = Color4.Orange },
                     Alpha = showColumn ? 1 : 0
                 },
                 content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 3bac3c7650..83491b6fe9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Height = 0.85f,
-                AccentColour = Color4.OrangeRed,
+                AccentColour = { Value = Color4.OrangeRed },
                 Action = { Value = action },
             };
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
index ea033082a7..d273f5cb35 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 {
                     Action = { Value = ManiaAction.Key1 },
                     Height = 0.85f,
-                    AccentColour = Color4.Gray
+                    AccentColour = { Value = Color4.Gray },
                 },
             };
         });
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 0153cdbd68..9d16e84f1e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private Container<Circle> bottomIcon = null!;
         private CircularContainer topIcon = null!;
 
+        private Bindable<Color4> accentColour = null!;
+
         [Resolved]
         private Column column { get; set; } = null!;
 
@@ -55,7 +57,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     {
                         Name = "Key gradient",
                         RelativeSizeAxes = Axes.Both,
-                        Colour = column.AccentColour.Darken(0.6f),
                     },
                     hitTargetLine = new Circle
                     {
@@ -80,7 +81,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                 Anchor = Anchor.BottomCentre,
                                 Origin = Anchor.Centre,
                                 Blending = BlendingParameters.Additive,
-                                Colour = column.AccentColour,
                                 Y = icon_vertical_offset,
                                 Children = new[]
                                 {
@@ -134,6 +134,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
+
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                background.Colour = colour.NewValue.Darken(0.6f);
+                bottomIcon.Colour = colour.NewValue;
+            }, true);
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
@@ -159,11 +166,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             if (e.Action != column.Action.Value) return false;
 
             const double lighting_fade_in_duration = 50;
-            Color4 lightingColour = column.AccentColour.Lighten(0.9f);
+            Color4 lightingColour = accentColour.Value.Lighten(0.9f);
 
             background
-                .FadeColour(column.AccentColour.Lighten(0.4f), 40).Then()
-                .FadeColour(column.AccentColour, 150, Easing.OutQuint);
+                .FadeColour(accentColour.Value.Lighten(0.4f), 40).Then()
+                .FadeColour(accentColour.Value, 150, Easing.OutQuint);
 
             hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
             hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -201,9 +208,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             if (e.Action != column.Action.Value) return;
 
             const double lighting_fade_out_duration = 300;
-            Color4 lightingColour = column.AccentColour.Lighten(0.9f).Opacity(0);
+            Color4 lightingColour = accentColour.Value.Lighten(0.9f).Opacity(0);
 
-            background.FadeColour(column.AccentColour.Darken(0.6f), lighting_fade_out_duration, Easing.OutQuint);
+            background.FadeColour(accentColour.Value.Darken(0.6f), lighting_fade_out_duration, Easing.OutQuint);
 
             topIcon.ScaleTo(1f, 200, Easing.OutQuint);
             topIcon.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -221,7 +228,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 Radius = 30,
             }, lighting_fade_out_duration, Easing.OutQuint);
 
-            bottomIcon.FadeColour(column.AccentColour, lighting_fade_out_duration, Easing.OutQuint);
+            bottomIcon.FadeColour(accentColour.Value, lighting_fade_out_duration, Easing.OutQuint);
 
             foreach (var circle in bottomIcon)
             {
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 8c50ab919b..81d9ae28ab 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Mania.UI
         /// </summary>
         public readonly bool IsSpecial;
 
-        public Color4 AccentColour { get; set; }
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>(Color4.Black);
 
         public Column(int index, bool isSpecial)
         {
@@ -77,6 +77,13 @@ namespace osu.Game.Rulesets.Mania.UI
             skin.SourceChanged += onSourceChanged;
             onSourceChanged();
 
+            AccentColour.BindValueChanged(colour =>
+            {
+                // Manual transfer as hit objects may be moved between column and unbinding is non-trivial.
+                foreach (var obj in HitObjectContainer.Objects)
+                    obj.AccentColour.Value = colour.NewValue;
+            }, true);
+
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
@@ -109,9 +116,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private void onSourceChanged()
         {
-            AccentColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
-            foreach (var obj in HitObjectContainer.Objects)
-                obj.AccentColour.Value = AccentColour;
+            AccentColour.Value = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
         }
 
         protected override void LoadComplete()
@@ -139,7 +144,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
 
-            maniaObject.AccentColour.Value = AccentColour;
+            maniaObject.AccentColour.Value = AccentColour.Value;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs
index 39d17db6be..3680e7ea0a 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultColumnBackground.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         [Resolved]
         private Column column { get; set; }
 
+        private Bindable<Color4> accentColour;
+
         public DefaultColumnBackground()
         {
             RelativeSizeAxes = Axes.Both;
@@ -55,9 +57,13 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 }
             };
 
-            background.Colour = column.AccentColour.Darken(5);
-            brightColour = column.AccentColour.Opacity(0.6f);
-            dimColour = column.AccentColour.Opacity(0);
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                background.Colour = colour.NewValue.Darken(5);
+                brightColour = colour.NewValue.Opacity(0.6f);
+                dimColour = colour.NewValue.Opacity(0);
+            }, true);
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
index 53fa86125f..97aa897782 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultHitTarget.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         private Container hitTargetLine;
         private Drawable hitTargetBar;
 
+        private Bindable<Color4> accentColour;
+
         [Resolved]
         private Column column { get; set; }
 
@@ -54,12 +56,16 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 },
             };
 
-            hitTargetLine.EdgeEffect = new EdgeEffectParameters
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
             {
-                Type = EdgeEffectType.Glow,
-                Radius = 5,
-                Colour = column.AccentColour.Opacity(0.5f),
-            };
+                hitTargetLine.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = colour.NewValue.Opacity(0.5f),
+                };
+            }, true);
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
index 5a0fab2ff4..6196850f91 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         private Container keyIcon;
         private Drawable gradient;
 
+        private Bindable<Color4> accentColour;
+
         [Resolved]
         private Column column { get; set; }
 
@@ -75,15 +77,19 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                 }
             };
 
-            keyIcon.EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Radius = 5,
-                Colour = column.AccentColour.Opacity(0.5f),
-            };
-
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
+
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                keyIcon.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = colour.NewValue.Opacity(0.5f),
+                };
+            });
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index e83cd10d2d..59716ee3e2 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -32,6 +32,10 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private CircularContainer largeFaint;
         private CircularContainer mainGlow1;
+        private CircularContainer mainGlow2;
+        private CircularContainer mainGlow3;
+
+        private Bindable<Color4> accentColour;
 
         public DefaultHitExplosion()
         {
@@ -48,8 +52,6 @@ namespace osu.Game.Rulesets.Mania.UI
             const float roundness = 80;
             const float initial_height = 10;
 
-            var colour = Interpolation.ValueAt(0.4f, column.AccentColour, Color4.White, 0, 1);
-
             InternalChildren = new Drawable[]
             {
                 largeFaint = new CircularContainer
@@ -61,13 +63,6 @@ namespace osu.Game.Rulesets.Mania.UI
                     // we want our size to be very small so the glow dominates it.
                     Size = new Vector2(default_large_faint_size),
                     Blending = BlendingParameters.Additive,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.1f, column.AccentColour, Color4.White, 0, 1).Opacity(0.3f),
-                        Roundness = 160,
-                        Radius = 200,
-                    },
                 },
                 mainGlow1 = new CircularContainer
                 {
@@ -76,15 +71,8 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
                     Blending = BlendingParameters.Additive,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.6f, column.AccentColour, Color4.White, 0, 1),
-                        Roundness = 20,
-                        Radius = 50,
-                    },
                 },
-                new CircularContainer
+                mainGlow2 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -93,15 +81,8 @@ namespace osu.Game.Rulesets.Mania.UI
                     Size = new Vector2(0.01f, initial_height),
                     Blending = BlendingParameters.Additive,
                     Rotation = RNG.NextSingle(-angle_variance, angle_variance),
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = colour,
-                        Roundness = roundness,
-                        Radius = 40,
-                    },
                 },
-                new CircularContainer
+                mainGlow3 = new CircularContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -110,18 +91,44 @@ namespace osu.Game.Rulesets.Mania.UI
                     Size = new Vector2(0.01f, initial_height),
                     Blending = BlendingParameters.Additive,
                     Rotation = RNG.NextSingle(-angle_variance, angle_variance),
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = colour,
-                        Roundness = roundness,
-                        Radius = 40,
-                    },
                 }
             };
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
+
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                largeFaint.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Interpolation.ValueAt(0.1f, colour.NewValue, Color4.White, 0, 1).Opacity(0.3f),
+                    Roundness = 160,
+                    Radius = 200,
+                };
+                mainGlow1.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Interpolation.ValueAt(0.6f, colour.NewValue, Color4.White, 0, 1),
+                    Roundness = 20,
+                    Radius = 50,
+                };
+                mainGlow2.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Interpolation.ValueAt(0.4f, colour.NewValue, Color4.White, 0, 1),
+                    Roundness = roundness,
+                    Radius = 40,
+                };
+                mainGlow3.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = Interpolation.ValueAt(0.4f, colour.NewValue, Color4.White, 0, 1),
+                    Roundness = roundness,
+                    Radius = 40,
+                };
+            }, true);
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)

From 4a127f5d8123d5ed782505c1f3d9ae8ae5817a23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Oct 2022 22:41:20 +0900
Subject: [PATCH 668/709] Fix classic skin colours sourcing from triangles
 defaults

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  3 ++
 .../Legacy/ManiaClassicSkinTransformer.cs     | 38 +++++++++++++++++++
 .../Legacy/ManiaLegacySkinTransformer.cs      | 17 ++++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaClassicSkinTransformer.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 9d2182f276..c4a8b7c8fa 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -74,6 +74,9 @@ namespace osu.Game.Rulesets.Mania
                 case ArgonSkin:
                     return new ManiaArgonSkinTransformer(skin);
 
+                case DefaultLegacySkin:
+                    return new ManiaClassicSkinTransformer(skin, beatmap);
+
                 case LegacySkin:
                     return new ManiaLegacySkinTransformer(skin, beatmap);
             }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaClassicSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaClassicSkinTransformer.cs
new file mode 100644
index 0000000000..e57927897c
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaClassicSkinTransformer.cs
@@ -0,0 +1,38 @@
+// 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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
+{
+    public class ManiaClassicSkinTransformer : ManiaLegacySkinTransformer
+    {
+        public ManiaClassicSkinTransformer(ISkin skin, IBeatmap beatmap)
+            : base(skin, beatmap)
+        {
+        }
+
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        {
+            if (lookup is ManiaSkinConfigurationLookup maniaLookup)
+            {
+                var baseLookup = base.GetConfig<TLookup, TValue>(lookup);
+
+                if (baseLookup != null)
+                    return baseLookup;
+
+                // default provisioning.
+                switch (maniaLookup.Lookup)
+                {
+                    case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Black));
+                }
+            }
+
+            return base.GetConfig<TLookup, TValue>(lookup);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 5a0478f025..759a1c2b38 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -8,12 +8,14 @@ using System.Collections.Generic;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
@@ -149,7 +151,20 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
-                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
+            {
+                var legacyLookup =
+                    base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
+
+                if (legacyLookup != null)
+                    return legacyLookup;
+
+                // default legacy fallback.
+                switch (maniaLookup.Lookup)
+                {
+                    case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Black));
+                }
+            }
 
             return base.GetConfig<TLookup, TValue>(lookup);
         }

From 0d21c0e49c682040034b97ee640cfbcbf6252403 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 14:10:39 +0900
Subject: [PATCH 669/709] Remove `StageDefinition` from configuration lookups

I added this for future usage, but it turns out I can get the
definitions directly from `ManiaBeatmap`.
---
 .../Skinning/Legacy/HitTargetInsetContainer.cs     |  5 ++---
 .../Skinning/Legacy/LegacyColumnBackground.cs      |  5 ++---
 .../Skinning/Legacy/LegacyHitTarget.cs             |  9 ++++-----
 .../Skinning/Legacy/LegacyManiaColumnElement.cs    |  2 +-
 .../Skinning/Legacy/LegacyManiaJudgementPiece.cs   |  5 ++---
 .../Skinning/Legacy/LegacyNotePiece.cs             |  5 ++---
 .../Skinning/Legacy/LegacyStageBackground.cs       | 14 +++++++-------
 .../Skinning/Legacy/LegacyStageForeground.cs       |  5 ++---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs  |  4 ++--
 .../Skinning/ManiaSkinConfigExtensions.cs          |  6 ++----
 .../Skinning/ManiaSkinConfigurationLookup.cs       | 10 +---------
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs           |  4 ++--
 .../UI/Components/HitObjectArea.cs                 |  6 +-----
 13 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
index de6d048295..362a265789 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/HitTargetInsetContainer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
@@ -31,9 +30,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition, stageDefinition)?.Value ?? Stage.HIT_TARGET_POSITION;
+            hitPosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.HitPosition)?.Value ?? Stage.HIT_TARGET_POSITION;
 
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(onDirectionChanged, true);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
index 08fa9b9a73..f35cedab08 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyColumnBackground.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -31,9 +30,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage, stageDefinition)?.Value
+            string lightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LightImage)?.Value
                                 ?? "mania-stage-light";
 
             float lightPosition = GetColumnSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.LightPosition)?.Value
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
index 9819f09e10..611dac30b3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitTarget.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -24,15 +23,15 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         private Container directionContainer;
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage, stageDefinition)?.Value
+            string targetImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.HitTargetImage)?.Value
                                  ?? "mania-stage-hint";
 
-            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine, stageDefinition)?.Value
+            bool showJudgementLine = skin.GetManiaSkinConfig<bool>(LegacyManiaSkinConfigurationLookups.ShowJudgementLine)?.Value
                                      ?? true;
 
-            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour, stageDefinition)?.Value
+            Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.JudgementLineColour)?.Value
                                 ?? Color4.White;
 
             InternalChild = directionContainer = new Container
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
index cfebad4add..e227c80845 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaColumnElement.cs
@@ -42,6 +42,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         protected IBindable<T> GetColumnSkinConfig<T>(ISkin skin, LegacyManiaSkinConfigurationLookups lookup)
-            => skin.GetManiaSkinConfig<T>(lookup, stage, Column.Index);
+            => skin.GetManiaSkinConfig<T>(lookup, Column.Index);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index f9653dab15..d09a73a693 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -33,9 +32,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, StageDefinition stageDefinition)
+        private void load(ISkinSource skin)
         {
-            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition, stageDefinition)?.Value;
+            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value;
 
             if (scorePosition != null)
                 scorePosition -= Stage.HIT_TARGET_POSITION + 150;
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
index 779e1a152c..41e149ea2f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyNotePiece.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -36,9 +35,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth, stageDefinition))?.Value;
+            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth))?.Value;
 
             InternalChild = directionContainer = new Container
             {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
index 01c2b599fa..d039551cd7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageBackground.cs
@@ -30,10 +30,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, StageDefinition stageDefinition)
         {
-            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage, stageDefinition)?.Value
+            string leftImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.LeftStageImage)?.Value
                                ?? "mania-stage-left";
 
-            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage, stageDefinition)?.Value
+            string rightImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.RightStageImage)?.Value
                                 ?? "mania-stage-right";
 
             InternalChildren = new[]
@@ -91,16 +91,16 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             }
 
             [BackgroundDependencyLoader]
-            private void load(ISkinSource skin, StageDefinition stageDefinition)
+            private void load(ISkinSource skin)
             {
-                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, stageDefinition, columnIndex)?.Value ?? 1;
-                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, stageDefinition, columnIndex)?.Value ?? 1;
+                float leftLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.LeftLineWidth, columnIndex)?.Value ?? 1;
+                float rightLineWidth = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.RightLineWidth, columnIndex)?.Value ?? 1;
 
                 bool hasLeftLine = leftLineWidth > 0;
                 bool hasRightLine = (rightLineWidth > 0 && skin.GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value >= 2.4m) || isLastColumn;
 
-                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, stageDefinition, columnIndex)?.Value ?? Color4.White;
-                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, columnIndex)?.Value ?? Color4.Black;
+                Color4 lineColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnLineColour, columnIndex)?.Value ?? Color4.White;
+                Color4 backgroundColour = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, columnIndex)?.Value ?? Color4.Black;
 
                 InternalChildren = new Drawable[]
                 {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
index 57b76c5402..f7c611d551 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyStageForeground.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
@@ -26,9 +25,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin, IScrollingInfo scrollingInfo, StageDefinition stageDefinition)
+        private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
-            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage, stageDefinition)?.Value
+            string bottomImage = skin.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.BottomStageImage)?.Value
                                  ?? "mania-stage-bottom";
 
             sprite = skin.GetAnimation(bottomImage, true, true)?.With(d =>
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 759a1c2b38..8dc81f2101 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             isLegacySkin = new Lazy<bool>(() => GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version) != null);
             hasKeyTexture = new Lazy<bool>(() =>
             {
-                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, new StageDefinition(1), 0)?.Value ?? "mania-key1";
+                string keyImage = this.GetManiaSkinConfig<string>(LegacyManiaSkinConfigurationLookups.KeyImage, 0)?.Value ?? "mania-key1";
                 return this.GetAnimation(keyImage, true, true) != null;
             });
         }
@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             if (!hit_result_mapping.ContainsKey(result))
                 return null;
 
-            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result], new StageDefinition(1))?.Value
+            string filename = this.GetManiaSkinConfig<string>(hit_result_mapping[result])?.Value
                               ?? default_hit_result_skin_filenames[result];
 
             var animation = this.GetAnimation(filename, true, true);
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
index 541b679043..e22bf63049 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigExtensions.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Skinning
@@ -16,10 +15,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         /// <param name="skin">The skin from which configuration is retrieved.</param>
         /// <param name="lookup">The value to retrieve.</param>
-        /// <param name="stageDefinition">The stage definition.</param>
         /// <param name="columnIndex">If not null, denotes the index of the column to which the entry applies.</param>
-        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, StageDefinition stageDefinition, int? columnIndex = null)
+        public static IBindable<T> GetManiaSkinConfig<T>(this ISkin skin, LegacyManiaSkinConfigurationLookups lookup, int? columnIndex = null)
             => skin.GetConfig<ManiaSkinConfigurationLookup, T>(
-                new ManiaSkinConfigurationLookup(lookup, stageDefinition, columnIndex));
+                new ManiaSkinConfigurationLookup(lookup, columnIndex));
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 8008c988d4..4ec18f9b01 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Skinning;
 
@@ -16,11 +15,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// </summary>
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
 
-        /// <summary>
-        /// The stage containing the component which is performing this lookup.
-        /// </summary>
-        public readonly StageDefinition StageDefinition;
-
         /// <summary>
         /// The intended <see cref="Column"/> index for the configuration.
         /// May be null if the configuration does not apply to a <see cref="Column"/>.
@@ -31,12 +25,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
         /// Creates a new <see cref="ManiaSkinConfigurationLookup"/>.
         /// </summary>
         /// <param name="lookup">The lookup value.</param>
-        /// <param name="stageDefinition">The stage definition.</param>
         /// <param name="columnIndex">The intended <see cref="Column"/> index for the configuration. May be null if the configuration does not apply to a <see cref="Column"/>.</param>
-        public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, StageDefinition stageDefinition, int? columnIndex = null)
+        public ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups lookup, int? columnIndex = null)
         {
             Lookup = lookup;
-            StageDefinition = stageDefinition;
             ColumnIndex = columnIndex;
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index bde2308635..871ec9f1a3 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -65,14 +65,14 @@ namespace osu.Game.Rulesets.Mania.UI
                 if (i > 0)
                 {
                     float spacing = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, stageDefinition, i - 1))
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnSpacing, i - 1))
                                                ?.Value ?? Stage.COLUMN_SPACING;
 
                     columns[i].Margin = new MarginPadding { Left = spacing };
                 }
 
                 float? width = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, stageDefinition, i))
+                                              new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ColumnWidth, i))
                                           ?.Value;
 
                 if (width == null)
diff --git a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
index 69bf146951..7f4b8eacde 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/HitObjectArea.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -20,9 +19,6 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
         public readonly HitObjectContainer HitObjectContainer;
 
-        [Resolved]
-        private StageDefinition stageDefinition { get; set; }
-
         public HitObjectArea(HitObjectContainer hitObjectContainer)
         {
             InternalChild = new Container
@@ -53,7 +49,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         protected virtual void UpdateHitPosition()
         {
             float hitPosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition, stageDefinition))?.Value
+                                    new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.HitPosition))?.Value
                                 ?? Stage.HIT_TARGET_POSITION;
 
             Padding = Direction.Value == ScrollingDirection.Up

From 13e0a59f707e38144bdfc709121f220f1196b360 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 14:19:00 +0900
Subject: [PATCH 670/709] Add note about why
 `LegacyManiaSkinConfigurationLookup` exist

---
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 8e786c96d9..6f934d1a92 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -3,6 +3,11 @@
 
 namespace osu.Game.Skinning
 {
+    /// <summary>
+    /// This class exists for the explicit purpose of ferrying information from ManiaBeatmap in a way LegacySkin can use it.
+    /// This is because half of the mania legacy skin implementation is in LegacySkin (osu.Game project) which doesn't have visibility
+    /// over ManiaBeatmap / StageDefinition.
+    /// </summary>
     public class LegacyManiaSkinConfigurationLookup
     {
         /// <summary>
@@ -10,9 +15,10 @@ namespace osu.Game.Skinning
         /// </summary>
         public readonly int TotalColumns;
 
-        public readonly LegacyManiaSkinConfigurationLookups Lookup;
         public readonly int? TargetColumn;
 
+        public readonly LegacyManiaSkinConfigurationLookups Lookup;
+
         public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
         {
             TotalColumns = totalColumns;

From eea3d5adb827c40bbc1c46cb38011623e1e32a5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 14:26:29 +0900
Subject: [PATCH 671/709] Standardise column index naming and xmldoc

---
 .../Skinning/ManiaSkinConfigurationLookup.cs  |  3 +-
 .../LegacyManiaSkinConfigurationLookup.cs     | 11 +++-
 osu.Game/Skinning/LegacySkin.cs               | 64 +++++++++----------
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
index 4ec18f9b01..59188f02f9 100644
--- a/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/ManiaSkinConfigurationLookup.cs
@@ -16,8 +16,9 @@ namespace osu.Game.Rulesets.Mania.Skinning
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
 
         /// <summary>
-        /// The intended <see cref="Column"/> index for the configuration.
+        /// The column which is being looked up.
         /// May be null if the configuration does not apply to a <see cref="Column"/>.
+        /// Note that this is the absolute index across all stages.
         /// </summary>
         public readonly int? ColumnIndex;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 6f934d1a92..c9e96ab3f1 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -15,15 +15,20 @@ namespace osu.Game.Skinning
         /// </summary>
         public readonly int TotalColumns;
 
-        public readonly int? TargetColumn;
+        /// <summary>
+        /// The column which is being looked up.
+        /// May be null if the configuration does not apply to a specific column.
+        /// Note that this is the absolute index across all stages.
+        /// </summary>
+        public readonly int? ColumnIndex;
 
         public readonly LegacyManiaSkinConfigurationLookups Lookup;
 
-        public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? targetColumn = null)
+        public LegacyManiaSkinConfigurationLookup(int totalColumns, LegacyManiaSkinConfigurationLookups lookup, int? columnIndex = null)
         {
             TotalColumns = totalColumns;
             Lookup = lookup;
-            TargetColumn = targetColumn;
+            ColumnIndex = columnIndex;
         }
     }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e1a630b643..646746a0f3 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -134,12 +134,12 @@ namespace osu.Game.Skinning
             switch (maniaLookup.Lookup)
             {
                 case LegacyManiaSkinConfigurationLookups.ColumnWidth:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value]));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value]));
 
                 case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.TargetColumn.Value]));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnSpacing[maniaLookup.ColumnIndex.Value]));
 
                 case LegacyManiaSkinConfigurationLookups.HitPosition:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
@@ -157,15 +157,15 @@ namespace osu.Game.Skinning
                     return SkinUtils.As<TValue>(getManiaImage(existing, "LightingN"));
 
                 case LegacyManiaSkinConfigurationLookups.ExplosionScale:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
 
                     if (GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
                         return SkinUtils.As<TValue>(new Bindable<float>(1));
 
-                    if (existing.ExplosionWidth[maniaLookup.TargetColumn.Value] != 0)
-                        return SkinUtils.As<TValue>(new Bindable<float>(existing.ExplosionWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+                    if (existing.ExplosionWidth[maniaLookup.ColumnIndex.Value] != 0)
+                        return SkinUtils.As<TValue>(new Bindable<float>(existing.ExplosionWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
@@ -174,53 +174,53 @@ namespace osu.Game.Skinning
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourJudgementLine"));
 
                 case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn + 1}"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.ColumnIndex + 1}"));
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLightColour:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn + 1}"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.ColumnIndex + 1}"));
 
                 case LegacyManiaSkinConfigurationLookups.MinimumColumnWidth:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.MinimumColumnWidth));
 
                 case LegacyManiaSkinConfigurationLookups.NoteImage:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}"));
 
                 case LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}H"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}H"));
 
                 case LegacyManiaSkinConfigurationLookups.HoldNoteTailImage:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}T"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}T"));
 
                 case LegacyManiaSkinConfigurationLookups.HoldNoteBodyImage:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.TargetColumn}L"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"NoteImage{maniaLookup.ColumnIndex}L"));
 
                 case LegacyManiaSkinConfigurationLookups.HoldNoteLightImage:
                     return SkinUtils.As<TValue>(getManiaImage(existing, "LightingL"));
 
                 case LegacyManiaSkinConfigurationLookups.HoldNoteLightScale:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
 
                     if (GetConfig<SkinConfiguration.LegacySetting, decimal>(SkinConfiguration.LegacySetting.Version)?.Value < 2.5m)
                         return SkinUtils.As<TValue>(new Bindable<float>(1));
 
-                    if (existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] != 0)
-                        return SkinUtils.As<TValue>(new Bindable<float>(existing.HoldNoteLightWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+                    if (existing.HoldNoteLightWidth[maniaLookup.ColumnIndex.Value] != 0)
+                        return SkinUtils.As<TValue>(new Bindable<float>(existing.HoldNoteLightWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.TargetColumn.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnWidth[maniaLookup.ColumnIndex.Value] / LegacyManiaSkinConfiguration.DEFAULT_COLUMN_SIZE));
 
                 case LegacyManiaSkinConfigurationLookups.KeyImage:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.ColumnIndex}"));
 
                 case LegacyManiaSkinConfigurationLookups.KeyImageDown:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.TargetColumn}D"));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(getManiaImage(existing, $"KeyImage{maniaLookup.ColumnIndex}D"));
 
                 case LegacyManiaSkinConfigurationLookups.LeftStageImage:
                     return SkinUtils.As<TValue>(getManiaImage(existing, "StageLeft"));
@@ -238,12 +238,12 @@ namespace osu.Game.Skinning
                     return SkinUtils.As<TValue>(getManiaImage(existing, "StageHint"));
 
                 case LegacyManiaSkinConfigurationLookups.LeftLineWidth:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value]));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.ColumnIndex.Value]));
 
                 case LegacyManiaSkinConfigurationLookups.RightLineWidth:
-                    Debug.Assert(maniaLookup.TargetColumn != null);
-                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.TargetColumn.Value + 1]));
+                    Debug.Assert(maniaLookup.ColumnIndex != null);
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ColumnLineWidth[maniaLookup.ColumnIndex.Value + 1]));
 
                 case LegacyManiaSkinConfigurationLookups.Hit0:
                 case LegacyManiaSkinConfigurationLookups.Hit50:

From dee01abab18c293eebb3320013bd2badbc9a531e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 14:51:17 +0900
Subject: [PATCH 672/709] Add method to get stage from column index

---
 osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs   | 14 ++++++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs            |  4 ++--
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs    | 12 ++++++++++--
 .../Default/ManiaTrianglesSkinTransformer.cs       | 13 ++++++++++---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs  |  1 -
 osu.Game.Rulesets.Mania/UI/Column.cs               |  6 +-----
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
index 4879ce6748..b5655a4579 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmap.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
@@ -60,5 +61,18 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 },
             };
         }
+
+        public StageDefinition GetStageForColumnIndex(int column)
+        {
+            foreach (var stage in Stages)
+            {
+                if (column < stage.Columns)
+                    return stage;
+
+                column -= stage.Columns;
+            }
+
+            throw new ArgumentOutOfRangeException(nameof(column), "Provided index exceeds all available stages");
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index c4a8b7c8fa..6162184c9a 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -69,10 +69,10 @@ namespace osu.Game.Rulesets.Mania
             switch (skin)
             {
                 case TrianglesSkin:
-                    return new ManiaTrianglesSkinTransformer(skin);
+                    return new ManiaTrianglesSkinTransformer(skin, beatmap);
 
                 case ArgonSkin:
-                    return new ManiaArgonSkinTransformer(skin);
+                    return new ManiaArgonSkinTransformer(skin, beatmap);
 
                 case DefaultLegacySkin:
                     return new ManiaClassicSkinTransformer(skin, beatmap);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index ea34d8d4c5..80dc3978df 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -4,6 +4,8 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -11,9 +13,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public class ManiaArgonSkinTransformer : SkinTransformer
     {
-        public ManiaArgonSkinTransformer(ISkin skin)
+        private readonly ManiaBeatmap beatmap;
+
+        public ManiaArgonSkinTransformer(ISkin skin, IBeatmap beatmap)
             : base(skin)
         {
+            this.beatmap = (ManiaBeatmap)beatmap;
         }
 
         public override Drawable? GetDrawableComponent(ISkinComponent component)
@@ -44,7 +49,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 switch (maniaLookup.Lookup)
                 {
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
-                        if (maniaLookup.StageDefinition.IsSpecialColumn(maniaLookup.ColumnIndex ?? 0))
+                        int column = maniaLookup.ColumnIndex ?? 0;
+                        var stage = beatmap.GetStageForColumnIndex(column);
+
+                        if (stage.IsSpecialColumn(column))
                             return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Yellow));
 
                         // TODO: Add actual colours.
diff --git a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
index 88f1f6ed26..eb51179cea 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Default/ManiaTrianglesSkinTransformer.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -10,9 +12,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
 {
     public class ManiaTrianglesSkinTransformer : SkinTransformer
     {
-        public ManiaTrianglesSkinTransformer(ISkin skin)
+        private readonly ManiaBeatmap beatmap;
+
+        public ManiaTrianglesSkinTransformer(ISkin skin, IBeatmap beatmap)
             : base(skin)
         {
+            this.beatmap = (ManiaBeatmap)beatmap;
         }
 
         private readonly Color4 colourEven = new Color4(6, 84, 0, 255);
@@ -28,10 +33,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Default
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
                         int column = maniaLookup.ColumnIndex ?? 0;
 
-                        if (maniaLookup.StageDefinition.IsSpecialColumn(column))
+                        var stage = beatmap.GetStageForColumnIndex(column);
+
+                        if (stage.IsSpecialColumn(column))
                             return SkinUtils.As<TValue>(new Bindable<Color4>(colourSpecial));
 
-                        int distanceToEdge = Math.Min(column, (maniaLookup.StageDefinition.Columns - 1) - column);
+                        int distanceToEdge = Math.Min(column, (stage.Columns - 1) - column);
                         return SkinUtils.As<TValue>(new Bindable<Color4>(distanceToEdge % 2 == 0 ? colourOdd : colourEven));
                 }
             }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 8dc81f2101..31cfcf9e16 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 81d9ae28ab..a622b8a155 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Skinning;
@@ -68,9 +67,6 @@ namespace osu.Game.Rulesets.Mania.UI
         [Resolved]
         private ISkinSource skin { get; set; }
 
-        [Resolved]
-        private StageDefinition stageDefinition { get; set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -116,7 +112,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private void onSourceChanged()
         {
-            AccentColour.Value = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, stageDefinition, Index)?.Value ?? Color4.Black;
+            AccentColour.Value = skin.GetManiaSkinConfig<Color4>(LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour, Index)?.Value ?? Color4.Black;
         }
 
         protected override void LoadComplete()

From 9a92ff1681066b8ea9dfdb030b8674c5d241e79a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 16:24:43 +0900
Subject: [PATCH 673/709] Fix `SourceChanged` unbind directionality and add
 null check

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index a622b8a155..89413f0f1b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -124,7 +124,9 @@ namespace osu.Game.Rulesets.Mania.UI
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            skin.SourceChanged += onSourceChanged;
+
+            if (skin != null)
+                skin.SourceChanged -= onSourceChanged;
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

From f1ea61b1a2bd1d277c9efa277075dd5e5d0a15df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 17:36:06 +0900
Subject: [PATCH 674/709] Remove unused colour code

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 52c8829df3..c4cbb74e57 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -43,13 +43,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly Drawable barLineContainer;
 
-        // private readonly Dictionary<ColumnType, Color4> columnColours = new Dictionary<ColumnType, Color4>
-        // {
-        //     { ColumnType.Even, new Color4(6, 84, 0, 255) },
-        //     { ColumnType.Odd, new Color4(94, 0, 57, 255) },
-        //     { ColumnType.Special, new Color4(0, 48, 63, 255) }
-        // };
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Columns.Any(c => c.ReceivePositionalInputAt(screenSpacePos));
 
         private readonly int firstColumnIndex;

From 6f8533ef6bc78450ef48fc74c3b64c0c8ea85102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 16:51:41 +0900
Subject: [PATCH 675/709] Remove pointless colour specifications in test scenes

---
 osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs   | 2 --
 .../Skinning/ManiaHitObjectTestScene.cs                         | 1 -
 2 files changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
index cefcce8319..d3e90170b2 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ColumnTestContainer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests.Skinning
 {
@@ -34,7 +33,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                 this.column = new Column(column, false)
                 {
                     Action = { Value = action },
-                    AccentColour = { Value = Color4.Orange },
                     Alpha = showColumn ? 1 : 0
                 },
                 content = new ManiaInputManager(new ManiaRuleset().RulesetInfo, 4)
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
index fd82041ad8..75175c43d8 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaHitObjectTestScene.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                             c.Add(CreateHitObject().With(h =>
                             {
                                 h.HitObject.StartTime = Time.Current + 5000;
-                                h.AccentColour.Value = Color4.Orange;
                             }));
                         })
                     },

From c1cb62cc35d75588f7462edceba8252762e3dc68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 16:54:08 +0900
Subject: [PATCH 676/709] Add basic argon note piece

---
 .../Skinning/Argon/ArgonHitTarget.cs          |   3 +-
 .../Skinning/Argon/ArgonNotePiece.cs          | 110 ++++++++++++++++++
 .../Argon/ManiaArgonSkinTransformer.cs        |   4 +
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
index 4750118583..7d7ef4a15e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK.Graphics;
 
@@ -20,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         private void load(IScrollingInfo scrollingInfo)
         {
             RelativeSizeAxes = Axes.X;
-            Height = DefaultNotePiece.NOTE_HEIGHT;
+            Height = ArgonNotePiece.NOTE_HEIGHT;
 
             InternalChildren = new[]
             {
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs
new file mode 100644
index 0000000000..f560d2676c
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs
@@ -0,0 +1,110 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    internal class ArgonNotePiece : CompositeDrawable
+    {
+        public const float NOTE_HEIGHT = 42;
+
+        public const float CORNER_RADIUS = 3;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        private readonly Box colouredBox;
+        private readonly Box shadow;
+
+        public ArgonNotePiece()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = NOTE_HEIGHT;
+
+            CornerRadius = CORNER_RADIUS;
+            Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                shadow = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.82f,
+                    Masking = true,
+                    CornerRadius = CORNER_RADIUS,
+                    Children = new Drawable[]
+                    {
+                        colouredBox = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    }
+                },
+                new Circle
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = CORNER_RADIUS * 2,
+                },
+                new SpriteIcon
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = 4,
+                    Icon = FontAwesome.Solid.AngleDown,
+                    Size = new Vector2(20),
+                    Scale = new Vector2(1, 0.7f)
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(IScrollingInfo scrollingInfo, DrawableHitObject? drawableObject)
+        {
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            if (drawableObject != null)
+            {
+                accentColour.BindTo(drawableObject.AccentColour);
+                accentColour.BindValueChanged(onAccentChanged, true);
+            }
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            colouredBox.Anchor = colouredBox.Origin = direction.NewValue == ScrollingDirection.Up
+                ? Anchor.TopCentre
+                : Anchor.BottomCentre;
+        }
+
+        private void onAccentChanged(ValueChangedEvent<Color4> accent)
+        {
+            colouredBox.Colour = ColourInfo.GradientVertical(
+                accent.NewValue.Lighten(0.1f),
+                accent.NewValue
+            );
+
+            shadow.Colour = accent.NewValue.Darken(0.5f);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 80dc3978df..d280a16113 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -29,6 +29,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (maniaComponent.Component)
                     {
+                        case ManiaSkinComponents.HoldNoteHead:
+                        case ManiaSkinComponents.Note:
+                            return new ArgonNotePiece();
+
                         case ManiaSkinComponents.HitTarget:
                             return new ArgonHitTarget();
 

From a10f9ebfa5b71039da9083464bf55f77d7784be3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 16:54:32 +0900
Subject: [PATCH 677/709] Update argon colours to roughly match design spec

---
 .../Argon/ManiaArgonSkinTransformer.cs        | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index d280a16113..4843621a1e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Skinning;
@@ -56,11 +55,49 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         int column = maniaLookup.ColumnIndex ?? 0;
                         var stage = beatmap.GetStageForColumnIndex(column);
 
-                        if (stage.IsSpecialColumn(column))
-                            return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Yellow));
+                        Color4 colour;
 
-                        // TODO: Add actual colours.
-                        return SkinUtils.As<TValue>(new Bindable<Color4>(new Color4(RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, RNG.NextSingle() * 0.5f, 1)));
+                        if (stage.IsSpecialColumn(column))
+                            colour = new Color4(159, 101, 255, 255);
+                        else
+                        {
+                            switch (column % 8)
+                            {
+                                default:
+                                    colour = new Color4(240, 216, 0, 255);
+                                    break;
+
+                                case 1:
+                                    colour = new Color4(240, 101, 0, 255);
+                                    break;
+
+                                case 2:
+                                    colour = new Color4(240, 0, 130, 255);
+                                    break;
+
+                                case 3:
+                                    colour = new Color4(192, 0, 240, 255);
+                                    break;
+
+                                case 4:
+                                    colour = new Color4(178, 0, 240, 255);
+                                    break;
+
+                                case 5:
+                                    colour = new Color4(0, 96, 240, 255);
+                                    break;
+
+                                case 6:
+                                    colour = new Color4(0, 226, 240, 255);
+                                    break;
+
+                                case 7:
+                                    colour = new Color4(0, 240, 96, 255);
+                                    break;
+                            }
+                        }
+
+                        return SkinUtils.As<TValue>(new Bindable<Color4>(colour));
                 }
             }
 

From 6c0923ec1aa421b3dc4252e8327ae1eb27005b37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 16:54:47 +0900
Subject: [PATCH 678/709] Add argon hold note pieces

---
 .../Skinning/Argon/ArgonHoldBodyPiece.cs      | 90 ++++++++++++++++++
 .../Skinning/Argon/ArgonHoldNoteTailPiece.cs  | 91 +++++++++++++++++++
 .../Argon/ManiaArgonSkinTransformer.cs        |  6 ++
 3 files changed, 187 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
new file mode 100644
index 0000000000..10d5a4d267
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
@@ -0,0 +1,90 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    /// <summary>
+    /// Represents length-wise portion of a hold note.
+    /// </summary>
+    public class ArgonHoldBodyPiece : CompositeDrawable
+    {
+        protected readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
+        protected readonly IBindable<bool> IsHitting = new Bindable<bool>();
+
+        private Drawable background = null!;
+        private Box foreground = null!;
+
+        public ArgonHoldBodyPiece()
+        {
+            Blending = BlendingParameters.Additive;
+            RelativeSizeAxes = Axes.Both;
+
+            // Without this, the width of the body will be slightly larger than the head/tail.
+            Masking = true;
+            CornerRadius = ArgonNotePiece.CORNER_RADIUS;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(DrawableHitObject? drawableObject)
+        {
+            InternalChildren = new[]
+            {
+                background = new Box { RelativeSizeAxes = Axes.Both },
+                foreground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0,
+                },
+            };
+
+            if (drawableObject != null)
+            {
+                var holdNote = (DrawableHoldNote)drawableObject;
+
+                AccentColour.BindTo(drawableObject.AccentColour);
+                IsHitting.BindTo(holdNote.IsHitting);
+            }
+
+            AccentColour.BindValueChanged(colour =>
+            {
+                background.Colour = colour.NewValue.Opacity(0.2f);
+                foreground.Colour = colour.NewValue.Opacity(0.1f);
+            }, true);
+
+            IsHitting.BindValueChanged(hitting =>
+            {
+                const float animation_length = 50;
+
+                foreground.ClearTransforms();
+
+                if (hitting.NewValue)
+                {
+                    // wait for the next sync point
+                    double synchronisedOffset = animation_length * 2 - Time.Current % (animation_length * 2);
+
+                    using (foreground.BeginDelayedSequence(synchronisedOffset))
+                    {
+                        foreground.FadeTo(1, animation_length).Then()
+                                  .FadeTo(0, animation_length)
+                                  .Loop();
+                    }
+                }
+                else
+                {
+                    foreground.FadeOut(animation_length);
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs
new file mode 100644
index 0000000000..e1068c6cd8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs
@@ -0,0 +1,91 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    internal class ArgonHoldNoteTailPiece : CompositeDrawable
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        private readonly Box colouredBox;
+        private readonly Box shadow;
+
+        public ArgonHoldNoteTailPiece()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = ArgonNotePiece.NOTE_HEIGHT;
+
+            CornerRadius = ArgonNotePiece.CORNER_RADIUS;
+            Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                shadow = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.82f,
+                    Masking = true,
+                    CornerRadius = ArgonNotePiece.CORNER_RADIUS,
+                    Children = new Drawable[]
+                    {
+                        colouredBox = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    }
+                },
+                new Circle
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = ArgonNotePiece.CORNER_RADIUS * 2,
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(IScrollingInfo scrollingInfo, DrawableHitObject? drawableObject)
+        {
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            if (drawableObject != null)
+            {
+                accentColour.BindTo(drawableObject.AccentColour);
+                accentColour.BindValueChanged(onAccentChanged, true);
+            }
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            colouredBox.Anchor = colouredBox.Origin = direction.NewValue == ScrollingDirection.Up
+                ? Anchor.TopCentre
+                : Anchor.BottomCentre;
+        }
+
+        private void onAccentChanged(ValueChangedEvent<Color4> accent)
+        {
+            colouredBox.Colour = ColourInfo.GradientVertical(
+                accent.NewValue,
+                accent.NewValue.Darken(0.1f)
+            );
+
+            shadow.Colour = accent.NewValue.Darken(0.5f);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 4843621a1e..c2b258c57c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (maniaComponent.Component)
                     {
+                        case ManiaSkinComponents.HoldNoteBody:
+                            return new ArgonHoldBodyPiece();
+
+                        case ManiaSkinComponents.HoldNoteTail:
+                            return new ArgonHoldNoteTailPiece();
+
                         case ManiaSkinComponents.HoldNoteHead:
                         case ManiaSkinComponents.Note:
                             return new ArgonNotePiece();

From 4cb07b88390fcbba3f4f786b075748dd5aad1700 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 17:46:54 +0900
Subject: [PATCH 679/709] Specify column widths for argon

---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index c2b258c57c..9123fa44d7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -55,11 +55,17 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
             {
+                int column = maniaLookup.ColumnIndex ?? 0;
+                var stage = beatmap.GetStageForColumnIndex(column);
+
                 switch (maniaLookup.Lookup)
                 {
+                    case LegacyManiaSkinConfigurationLookups.ColumnWidth:
+                        return SkinUtils.As<TValue>(new Bindable<float>(
+                            stage.IsSpecialColumn(column) ? 80 : 60
+                        ));
+
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
-                        int column = maniaLookup.ColumnIndex ?? 0;
-                        var stage = beatmap.GetStageForColumnIndex(column);
 
                         Color4 colour;
 

From a543222a2b2653045882c9b9e0ef58be7e8b723e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 18:03:48 +0900
Subject: [PATCH 680/709] Add ability to pad stage vertically

---
 .../Argon/ManiaArgonSkinTransformer.cs        |  4 +++
 osu.Game.Rulesets.Mania/UI/ColumnFlow.cs      |  2 ++
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 32 +++++++++++++++++++
 .../LegacyManiaSkinConfigurationLookup.cs     |  2 ++
 4 files changed, 40 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 9123fa44d7..9ed324793b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -60,6 +60,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                 switch (maniaLookup.Lookup)
                 {
+                    case LegacyManiaSkinConfigurationLookups.StagePaddingBottom:
+                    case LegacyManiaSkinConfigurationLookups.StagePaddingTop:
+                        return SkinUtils.As<TValue>(new Bindable<float>(30));
+
                     case LegacyManiaSkinConfigurationLookups.ColumnWidth:
                         return SkinUtils.As<TValue>(new Bindable<float>(
                             stage.IsSpecialColumn(column) ? 80 : 60
diff --git a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
index 871ec9f1a3..9b3f6d7033 100644
--- a/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
+++ b/osu.Game.Rulesets.Mania/UI/ColumnFlow.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
             AutoSizeAxes = Axes.X;
 
+            Masking = true;
+
             InternalChild = columns = new FillFlowContainer<Container>
             {
                 RelativeSizeAxes = Axes.Y,
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index c4cbb74e57..1273cb3d32 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -130,6 +131,37 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
+        private ISkinSource currentSkin;
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            currentSkin = skin;
+
+            skin.SourceChanged += onSkinChanged;
+            onSkinChanged();
+        }
+
+        private void onSkinChanged()
+        {
+            float paddingTop = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.StagePaddingTop))?.Value ?? 0;
+            float paddingBottom = currentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.StagePaddingBottom))?.Value ?? 0;
+
+            Padding = new MarginPadding
+            {
+                Top = paddingTop,
+                Bottom = paddingBottom,
+            };
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (currentSkin != null)
+                currentSkin.SourceChanged -= onSkinChanged;
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index c9e96ab3f1..3ec0ee6006 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Skinning
         HitPosition,
         ScorePosition,
         LightPosition,
+        StagePaddingTop,
+        StagePaddingBottom,
         HitTargetImage,
         ShowJudgementLine,
         KeyImage,

From 59bbbf1c087b54f13d1e72a7c46defc0dde3c8f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 18:07:56 +0900
Subject: [PATCH 681/709] Improve colours and hit metrics on key area

---
 .../Skinning/Argon/ArgonHitTarget.cs          |  3 ++
 .../Skinning/Argon/ArgonKeyArea.cs            | 30 ++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
index 7d7ef4a15e..9e449623d5 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitTarget.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             RelativeSizeAxes = Axes.X;
             Height = ArgonNotePiece.NOTE_HEIGHT;
 
+            Masking = true;
+            CornerRadius = ArgonNotePiece.CORNER_RADIUS;
+
             InternalChildren = new[]
             {
                 new Box
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 9d16e84f1e..eef7e2ff7c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
@@ -53,18 +54,24 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 Height = Stage.HIT_TARGET_POSITION,
                 Children = new[]
                 {
-                    background = new Box
+                    new Container
                     {
-                        Name = "Key gradient",
+                        Masking = true,
                         RelativeSizeAxes = Axes.Both,
+                        CornerRadius = ArgonNotePiece.CORNER_RADIUS,
+                        Child = background = new Box
+                        {
+                            Name = "Key gradient",
+                            RelativeSizeAxes = Axes.Both,
+                        },
                     },
                     hitTargetLine = new Circle
                     {
                         RelativeSizeAxes = Axes.X,
                         Anchor = Anchor.TopCentre,
-                        Origin = Anchor.Centre,
+                        Origin = Anchor.BottomCentre,
                         Colour = OsuColour.Gray(196 / 255f),
-                        Height = 4,
+                        Height = ArgonNotePiece.CORNER_RADIUS * 2,
                         Masking = true,
                     },
                     new Container
@@ -137,10 +144,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
             accentColour = column.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(colour =>
-            {
-                background.Colour = colour.NewValue.Darken(0.6f);
-                bottomIcon.Colour = colour.NewValue;
-            }, true);
+                {
+                    background.Colour = colour.NewValue.Darken(1f);
+                    bottomIcon.Colour = colour.NewValue;
+                },
+                true);
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
@@ -169,8 +177,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             Color4 lightingColour = accentColour.Value.Lighten(0.9f);
 
             background
-                .FadeColour(accentColour.Value.Lighten(0.4f), 40).Then()
-                .FadeColour(accentColour.Value, 150, Easing.OutQuint);
+                .FadeColour(accentColour.Value, 40).Then()
+                .FadeColour(accentColour.Value.Darken(0.4f), 150, Easing.OutQuint);
 
             hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
             hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -225,7 +233,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             {
                 Type = EdgeEffectType.Glow,
                 Colour = lightingColour,
-                Radius = 30,
+                Radius = 25,
             }, lighting_fade_out_duration, Easing.OutQuint);
 
             bottomIcon.FadeColour(accentColour.Value, lighting_fade_out_duration, Easing.OutQuint);

From f3e3ee81cbda6f9968896c31a172943e01ec2486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 18:12:55 +0900
Subject: [PATCH 682/709] Add column and stage background to argon skin

---
 .../Skinning/Argon/ArgonColumnBackground.cs   | 101 ++++++++++++++++++
 .../Skinning/Argon/ArgonStageBackground.cs    |  16 +++
 .../Argon/ManiaArgonSkinTransformer.cs        |   6 ++
 3 files changed, 123 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonStageBackground.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
new file mode 100644
index 0000000000..c6377f9152
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
@@ -0,0 +1,101 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonColumnBackground : CompositeDrawable, IKeyBindingHandler<ManiaAction>
+    {
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Color4 brightColour;
+        private Color4 dimColour;
+
+        private Box background = null!;
+        private Box backgroundOverlay = null!;
+
+        [Resolved]
+        private Column column { get; set; } = null!;
+
+        private Bindable<Color4> accentColour = null!;
+
+        public ArgonColumnBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            Masking = true;
+            CornerRadius = ArgonNotePiece.CORNER_RADIUS;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChildren = new[]
+            {
+                background = new Box
+                {
+                    Name = "Background",
+                    RelativeSizeAxes = Axes.Both,
+                },
+                backgroundOverlay = new Box
+                {
+                    Name = "Background Gradient Overlay",
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0
+                }
+            };
+
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                background.Colour = colour.NewValue.Darken(5);
+                brightColour = colour.NewValue.Opacity(0.6f);
+                dimColour = colour.NewValue.Opacity(0);
+            }, true);
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                backgroundOverlay.Anchor = backgroundOverlay.Origin = Anchor.TopLeft;
+                backgroundOverlay.Colour = ColourInfo.GradientVertical(brightColour, dimColour);
+            }
+            else
+            {
+                backgroundOverlay.Anchor = backgroundOverlay.Origin = Anchor.BottomLeft;
+                backgroundOverlay.Colour = ColourInfo.GradientVertical(dimColour, brightColour);
+            }
+        }
+
+        public bool OnPressed(KeyBindingPressEvent<ManiaAction> e)
+        {
+            if (e.Action == column.Action.Value)
+                backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
+            return false;
+        }
+
+        public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
+        {
+            if (e.Action == column.Action.Value)
+                backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonStageBackground.cs
new file mode 100644
index 0000000000..1881695b14
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonStageBackground.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.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonStageBackground : CompositeDrawable
+    {
+        public ArgonStageBackground()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 9ed324793b..45ee25e388 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (maniaComponent.Component)
                     {
+                        case ManiaSkinComponents.StageBackground:
+                            return new ArgonStageBackground();
+
+                        case ManiaSkinComponents.ColumnBackground:
+                            return new ArgonColumnBackground();
+
                         case ManiaSkinComponents.HoldNoteBody:
                             return new ArgonHoldBodyPiece();
 

From 258c93557408a5aefaa8bc473c64cea7e582c532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 18:29:07 +0900
Subject: [PATCH 683/709] Remove key area background (the column background is
 enough to work well)

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index eef7e2ff7c..72f5f81890 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -12,7 +12,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 using osuTK.Graphics;
@@ -62,6 +61,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         Child = background = new Box
                         {
                             Name = "Key gradient",
+                            Alpha = 0,
+                            Blending = BlendingParameters.Additive,
                             RelativeSizeAxes = Axes.Both,
                         },
                     },
@@ -177,8 +178,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             Color4 lightingColour = accentColour.Value.Lighten(0.9f);
 
             background
-                .FadeColour(accentColour.Value, 40).Then()
-                .FadeColour(accentColour.Value.Darken(0.4f), 150, Easing.OutQuint);
+                .FadeTo(1, 40).Then()
+                .FadeTo(0.8f, 150, Easing.OutQuint);
 
             hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
             hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -218,7 +219,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             const double lighting_fade_out_duration = 300;
             Color4 lightingColour = accentColour.Value.Lighten(0.9f).Opacity(0);
 
-            background.FadeColour(accentColour.Value.Darken(0.6f), lighting_fade_out_duration, Easing.OutQuint);
+            background.FadeTo(0, lighting_fade_out_duration, Easing.OutQuint);
 
             topIcon.ScaleTo(1f, 200, Easing.OutQuint);
             topIcon.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters

From b95743092d2e95110f5bf4379c20b29335f569ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 20:51:28 +0900
Subject: [PATCH 684/709] Add argon hit explosion

---
 .../Skinning/Argon/ArgonHitExplosion.cs       | 99 +++++++++++++++++++
 .../Argon/ManiaArgonSkinTransformer.cs        |  3 +
 2 files changed, 102 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs
new file mode 100644
index 0000000000..132ef0d528
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs
@@ -0,0 +1,99 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonHitExplosion : CompositeDrawable, IHitExplosion
+    {
+        private const float default_large_faint_size = 0.8f;
+
+        public override bool RemoveWhenNotAlive => true;
+
+        [Resolved]
+        private Column column { get; set; } = null!;
+
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container largeFaint = null!;
+
+        private Bindable<Color4> accentColour = null!;
+
+        public ArgonHitExplosion()
+        {
+            Origin = Anchor.Centre;
+
+            RelativeSizeAxes = Axes.X;
+            Height = ArgonNotePiece.NOTE_HEIGHT;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
+            InternalChildren = new Drawable[]
+            {
+                largeFaint = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    CornerRadius = ArgonNotePiece.CORNER_RADIUS,
+                    Blending = BlendingParameters.Additive,
+                    Child = new Box
+                    {
+                        Colour = Color4.White,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                },
+            };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(onDirectionChanged, true);
+
+            accentColour = column.AccentColour.GetBoundCopy();
+            accentColour.BindValueChanged(colour =>
+            {
+                largeFaint.Colour = Interpolation.ValueAt(0.8f, colour.NewValue, Color4.White, 0, 1);
+
+                largeFaint.EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Glow,
+                    Colour = colour.NewValue,
+                    Roundness = 40,
+                    Radius = 60,
+                };
+            }, true);
+        }
+
+        private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)
+        {
+            if (direction.NewValue == ScrollingDirection.Up)
+            {
+                Anchor = Anchor.TopCentre;
+                Y = ArgonNotePiece.NOTE_HEIGHT / 2;
+            }
+            else
+            {
+                Anchor = Anchor.BottomCentre;
+                Y = -ArgonNotePiece.NOTE_HEIGHT / 2;
+            }
+        }
+
+        public void Animate(JudgementResult result)
+        {
+            this.FadeOutFromOne(PoolableHitExplosion.DURATION, Easing.Out);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 45ee25e388..37ab958eee 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -49,6 +49,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                         case ManiaSkinComponents.KeyArea:
                             return new ArgonKeyArea();
+
+                        case ManiaSkinComponents.HitExplosion:
+                            return new ArgonHitExplosion();
                     }
 
                     break;

From e4e4c1b66169d842babd595697a70a7db0514f36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 21:39:29 +0900
Subject: [PATCH 685/709] Add very temporary mania judgement display for argon
 skin

---
 .../Skinning/Argon/ArgonJudgementPiece.cs     | 193 ++++++++++++++++++
 .../Argon/ManiaArgonSkinTransformer.cs        |   4 +
 2 files changed, 197 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
new file mode 100644
index 0000000000..e7dfec256d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonJudgementPiece.cs
@@ -0,0 +1,193 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Argon
+{
+    public class ArgonJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        protected readonly HitResult Result;
+
+        protected SpriteText JudgementText { get; private set; } = null!;
+
+        private RingExplosion? ringExplosion;
+
+        [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        public ArgonJudgementPiece(HitResult result)
+        {
+            Result = result;
+            Origin = Anchor.Centre;
+            Y = 160;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                JudgementText = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Text = Result.GetDescription().ToUpperInvariant(),
+                    Colour = colours.ForHitResult(Result),
+                    Blending = BlendingParameters.Additive,
+                    Spacing = new Vector2(10, 0),
+                    Font = OsuFont.Default.With(size: 28, weight: FontWeight.Regular),
+                },
+            };
+
+            if (Result.IsHit())
+            {
+                AddInternal(ringExplosion = new RingExplosion(Result)
+                {
+                    Colour = colours.ForHitResult(Result),
+                });
+            }
+        }
+
+        /// <summary>
+        /// Plays the default animation for this judgement piece.
+        /// </summary>
+        /// <remarks>
+        /// The base implementation only handles fade (for all result types) and misses.
+        /// Individual rulesets are recommended to implement their appropriate hit animations.
+        /// </remarks>
+        public virtual void PlayAnimation()
+        {
+            switch (Result)
+            {
+                default:
+                    JudgementText
+                        .ScaleTo(Vector2.One)
+                        .ScaleTo(new Vector2(1.4f), 1800, Easing.OutQuint);
+                    break;
+
+                case HitResult.Miss:
+                    this.ScaleTo(1.6f);
+                    this.ScaleTo(1, 100, Easing.In);
+
+                    this.MoveTo(Vector2.Zero);
+                    this.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    this.RotateTo(0);
+                    this.RotateTo(40, 800, Easing.InQuint);
+                    break;
+            }
+
+            this.FadeOutFromOne(800);
+
+            ringExplosion?.PlayAnimation();
+        }
+
+        public Drawable? GetAboveHitObjectsProxiedContent() => null;
+
+        private class RingExplosion : CompositeDrawable
+        {
+            private readonly float travel = 52;
+
+            public RingExplosion(HitResult result)
+            {
+                const float thickness = 4;
+
+                const float small_size = 9;
+                const float large_size = 14;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Blending = BlendingParameters.Additive;
+
+                int countSmall = 0;
+                int countLarge = 0;
+
+                switch (result)
+                {
+                    case HitResult.Meh:
+                        countSmall = 3;
+                        travel *= 0.3f;
+                        break;
+
+                    case HitResult.Ok:
+                    case HitResult.Good:
+                        countSmall = 4;
+                        travel *= 0.6f;
+                        break;
+
+                    case HitResult.Great:
+                    case HitResult.Perfect:
+                        countSmall = 4;
+                        countLarge = 4;
+                        break;
+                }
+
+                for (int i = 0; i < countSmall; i++)
+                    AddInternal(new RingPiece(thickness) { Size = new Vector2(small_size) });
+
+                for (int i = 0; i < countLarge; i++)
+                    AddInternal(new RingPiece(thickness) { Size = new Vector2(large_size) });
+            }
+
+            public void PlayAnimation()
+            {
+                foreach (var c in InternalChildren)
+                {
+                    const float start_position_ratio = 0.3f;
+
+                    float direction = RNG.NextSingle(0, 360);
+                    float distance = RNG.NextSingle(travel / 2, travel);
+
+                    c.MoveTo(new Vector2(
+                        MathF.Cos(direction) * distance * start_position_ratio,
+                        MathF.Sin(direction) * distance * start_position_ratio
+                    ));
+
+                    c.MoveTo(new Vector2(
+                        MathF.Cos(direction) * distance,
+                        MathF.Sin(direction) * distance
+                    ), 600, Easing.OutQuint);
+                }
+
+                this.FadeOutFromOne(1000, Easing.OutQuint);
+            }
+
+            public class RingPiece : CircularContainer
+            {
+                public RingPiece(float thickness = 9)
+                {
+                    Anchor = Anchor.Centre;
+                    Origin = Anchor.Centre;
+
+                    Masking = true;
+                    BorderThickness = thickness;
+                    BorderColour = Color4.White;
+
+                    Child = new Box
+                    {
+                        AlwaysPresent = true,
+                        Alpha = 0,
+                        RelativeSizeAxes = Axes.Both
+                    };
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 37ab958eee..cf08f7ea3e 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -5,6 +5,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
@@ -24,6 +25,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             switch (component)
             {
+                case GameplaySkinComponent<HitResult> resultComponent:
+                    return new ArgonJudgementPiece(resultComponent.Component);
+
                 case ManiaSkinComponent maniaComponent:
                     // TODO: Once everything is finalised, consider throwing UnsupportedSkinComponentException on missing entries.
                     switch (maniaComponent.Component)

From 6d14ccb8e0bbeba807255e423f1e9030d6bee39b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 21:46:02 +0900
Subject: [PATCH 686/709] Make special key slightly wider

---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index cf08f7ea3e..93c3a94316 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                     case LegacyManiaSkinConfigurationLookups.ColumnWidth:
                         return SkinUtils.As<TValue>(new Bindable<float>(
-                            stage.IsSpecialColumn(column) ? 80 : 60
+                            stage.IsSpecialColumn(column) ? 120 : 60
                         ));
 
                     case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:

From e81f550150438741a9da4ee7e26a7899b9d9b673 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 19:35:01 +0900
Subject: [PATCH 687/709] Fix hit explosions not being cleaned up correctly
 when rewinding

---
 osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
index 28509d1f4e..a7b94f9f22 100644
--- a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             base.PrepareForUse();
 
+            LifetimeStart = Time.Current;
+
             (skinnableExplosion?.Drawable as IHitExplosion)?.Animate(Result);
 
             this.Delay(DURATION).Then().Expire();

From 207c76bdecc83879384a52ee3fcc7d579bc2a7eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Oct 2022 20:17:35 +0900
Subject: [PATCH 688/709] Fix column lighting and key area not handling rewind
 correctly

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 89413f0f1b..61585b2e5b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Platform;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
@@ -68,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.UI
         private ISkinSource skin { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(GameHost host)
         {
             skin.SourceChanged += onSourceChanged;
             onSourceChanged();
@@ -82,7 +83,10 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
-                RelativeSizeAxes = Axes.Both
+                RelativeSizeAxes = Axes.Both,
+                // This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
+                Clock = host.UpdateThread.Clock,
+                ProcessCustomClock = false,
             };
 
             InternalChildren = new[]
@@ -94,7 +98,10 @@ namespace osu.Game.Rulesets.Mania.UI
                 HitObjectArea,
                 new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
+                    // This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
+                    Clock = host.UpdateThread.Clock,
+                    ProcessCustomClock = false,
                 },
                 background,
                 TopLevelContainer,

From 98b578e8e6f37e389dc9ee3bfcc0602e9946cc24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 16:12:10 +0900
Subject: [PATCH 689/709] Remove left-over incorrect fallback logic

This was moved to `ManiaClassicSkinTransformer`.
---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 31cfcf9e16..1d39721a2b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -14,7 +14,6 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
@@ -151,18 +150,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             if (lookup is ManiaSkinConfigurationLookup maniaLookup)
             {
-                var legacyLookup =
-                    base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
-
-                if (legacyLookup != null)
-                    return legacyLookup;
-
-                // default legacy fallback.
-                switch (maniaLookup.Lookup)
-                {
-                    case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
-                        return SkinUtils.As<TValue>(new Bindable<Color4>(Color4.Black));
-                }
+                return base.GetConfig<LegacyManiaSkinConfigurationLookup, TValue>(new LegacyManiaSkinConfigurationLookup(beatmap.TotalColumns, maniaLookup.Lookup, maniaLookup.ColumnIndex));
             }
 
             return base.GetConfig<TLookup, TValue>(lookup);

From c7405d1c1cc8ddcb0bf0a32799e115992318ae3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 17:00:10 +0900
Subject: [PATCH 690/709] Add missing immediate application of `AccentColour`
 in `DefaultKeyArea`

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
index 6196850f91..600c9feb73 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     Radius = 5,
                     Colour = colour.NewValue.Opacity(0.5f),
                 };
-            });
+            }, true);
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)

From 4b772643e98999f04ad5b1cf927f5c64c4c84c1b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:25:07 +0900
Subject: [PATCH 691/709] Use bindable flow for transfer of accent colour from
 columns to hit objects

This fixes the case where changing a skin during gameplay runtime does
not correctly convey colour information to off-screen `DrawableHitObject`s.
---
 osu.Game.Rulesets.Mania/UI/Column.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 89413f0f1b..c6bb3910e2 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -73,13 +73,6 @@ namespace osu.Game.Rulesets.Mania.UI
             skin.SourceChanged += onSourceChanged;
             onSourceChanged();
 
-            AccentColour.BindValueChanged(colour =>
-            {
-                // Manual transfer as hit objects may be moved between column and unbinding is non-trivial.
-                foreach (var obj in HitObjectContainer.Objects)
-                    obj.AccentColour.Value = colour.NewValue;
-            }, true);
-
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
@@ -142,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
 
-            maniaObject.AccentColour.Value = AccentColour.Value;
+            maniaObject.AccentColour.BindTo(AccentColour);
             maniaObject.CheckHittable = hitPolicy.IsHittable;
         }
 

From 52ad766f86c933c4621e5fac1dc423227273dded Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:25:54 +0900
Subject: [PATCH 692/709] Remove manual binding of nested objects in
 `DrawableManiaHitObject`

This is now handled by `Column` itself. Leaving the logic here as well
will cause a circular bindable flow and stack overflow.
---
 .../Objects/Drawables/DrawableManiaHitObject.cs  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 6cd39d835d..73dc937a00 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -65,22 +65,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
-        protected override void OnApply()
-        {
-            base.OnApply();
-
-            if (ParentHitObject != null)
-                AccentColour.BindTo(ParentHitObject.AccentColour);
-        }
-
-        protected override void OnFree()
-        {
-            base.OnFree();
-
-            if (ParentHitObject != null)
-                AccentColour.UnbindFrom(ParentHitObject.AccentColour);
-        }
-
         protected virtual void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
         {
             Anchor = Origin = e.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;

From a8742f0cc31ba72e19e3d82d840cbcaf2acb5b55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:46:26 +0900
Subject: [PATCH 693/709] Adjust out-of-the-box background dim back down to 70%

It was previously bumped from 60% to 80%, but I've recently
felt that this is too high as a default, and takes away from storyboards
and video backgrounds.
---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e3bfb6b1e9..1378e1691a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Configuration
             // Gameplay
             SetDefault(OsuSetting.PositionalHitsounds, true); // replaced by level setting below, can be removed 20220703.
             SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
-            SetDefault(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
+            SetDefault(OsuSetting.DimLevel, 0.7, 0, 1, 0.01);
             SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
             SetDefault(OsuSetting.LightenDuringBreaks, true);
 

From 58eaa18725f4535e9b3eb7d785803863b0bac393 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:44:16 +0900
Subject: [PATCH 694/709] Add transparency to column backgrounds

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
index c6377f9152..bfa3b34890 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             accentColour = column.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(colour =>
             {
-                background.Colour = colour.NewValue.Darken(5);
+                background.Colour = colour.NewValue.Darken(3).Opacity(0.6f);
                 brightColour = colour.NewValue.Opacity(0.6f);
                 dimColour = colour.NewValue.Opacity(0);
             }, true);

From f9b4f491a69fca8e49fa780a1a3da3fbeeec45d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:44:24 +0900
Subject: [PATCH 695/709] Increase overall corner radius slightly

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs
index f560d2676c..454a6b012b 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
     {
         public const float NOTE_HEIGHT = 42;
 
-        public const float CORNER_RADIUS = 3;
+        public const float CORNER_RADIUS = 3.4f;
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();

From 12e9686092704b5e21f5020396d2d20e9d7162de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 18:44:29 +0900
Subject: [PATCH 696/709] Increase column spacing

---
 .../Skinning/Argon/ManiaArgonSkinTransformer.cs                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
index 93c3a94316..27926c11eb 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ManiaArgonSkinTransformer.cs
@@ -73,6 +73,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
                 switch (maniaLookup.Lookup)
                 {
+                    case LegacyManiaSkinConfigurationLookups.ColumnSpacing:
+                        return SkinUtils.As<TValue>(new Bindable<float>(2));
+
                     case LegacyManiaSkinConfigurationLookups.StagePaddingBottom:
                     case LegacyManiaSkinConfigurationLookups.StagePaddingTop:
                         return SkinUtils.As<TValue>(new Bindable<float>(30));

From e4657a7a3d0784afea6b56fd1f206addf2f9af0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 19:02:08 +0900
Subject: [PATCH 697/709] Fix argon key area lighting being hidden by other
 columns in one direction

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs | 2 --
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs      | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs
index 132ef0d528..af179d5580 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHitExplosion.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 {
     public class ArgonHitExplosion : CompositeDrawable, IHitExplosion
     {
-        private const float default_large_faint_size = 0.8f;
-
         public override bool RemoveWhenNotAlive => true;
 
         [Resolved]
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 72f5f81890..073b9af307 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -150,6 +150,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     bottomIcon.Colour = colour.NewValue;
                 },
                 true);
+
+            // Yes, proxy everything.
+            column.TopLevelContainer.Add(CreateProxy());
         }
 
         private void onDirectionChanged(ValueChangedEvent<ScrollingDirection> direction)

From a4f827c7fd22f892612171e42c9dd8f5e06bd223 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 19:02:15 +0900
Subject: [PATCH 698/709] Remove broken `KeyArea` test scene

Use `TestSceneStage` instead.
---
 .../Skinning/TestSceneKeyArea.cs              | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
deleted file mode 100644
index bbbd7edb7b..0000000000
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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.
-
-#nullable disable
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.UI.Components;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Rulesets.Mania.Tests.Skinning
-{
-    public class TestSceneKeyArea : ManiaSkinnableTestScene
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            SetContents(_ => new FillFlowContainer
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Size = new Vector2(0.8f),
-                Direction = FillDirection.Horizontal,
-                Children = new Drawable[]
-                {
-                    new ColumnTestContainer(0, ManiaAction.Key1)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                    },
-                    new ColumnTestContainer(1, ManiaAction.Key2)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                    },
-                }
-            });
-        }
-    }
-}

From 551b7f0d1c0e43ecf1e50dd6c66e219c40953a11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 19:08:55 +0900
Subject: [PATCH 699/709] Fix corner radius visible below hit target line

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 073b9af307..dd6aeadd65 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -50,7 +50,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             InternalChild = directionContainer = new Container
             {
                 RelativeSizeAxes = Axes.X,
-                Height = Stage.HIT_TARGET_POSITION,
+                // Ensure the area is tall enough to put the target line in the correct location.
+                // This is to also allow the main background component to overlap the target line
+                // and avoid an inner corner radius being shown below the target line.
+                Height = Stage.HIT_TARGET_POSITION + ArgonNotePiece.CORNER_RADIUS * 2,
                 Children = new[]
                 {
                     new Container
@@ -70,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     {
                         RelativeSizeAxes = Axes.X,
                         Anchor = Anchor.TopCentre,
-                        Origin = Anchor.BottomCentre,
+                        Origin = Anchor.TopCentre,
                         Colour = OsuColour.Gray(196 / 255f),
                         Height = ArgonNotePiece.CORNER_RADIUS * 2,
                         Masking = true,

From 08c3f3ae6df6387210d8255dff878256293f8699 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 19:27:00 +0900
Subject: [PATCH 700/709] Adjust lighting and timing of key area in general

---
 .../Skinning/Argon/ArgonKeyArea.cs            | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index dd6aeadd65..badca71f36 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -65,7 +66,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         {
                             Name = "Key gradient",
                             Alpha = 0,
-                            Blending = BlendingParameters.Additive,
                             RelativeSizeAxes = Axes.Both,
                         },
                     },
@@ -149,7 +149,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             accentColour = column.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(colour =>
                 {
-                    background.Colour = colour.NewValue.Darken(1f);
+                    background.Colour = colour.NewValue.Darken(0.2f);
                     bottomIcon.Colour = colour.NewValue;
                 },
                 true);
@@ -180,18 +180,19 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action != column.Action.Value) return false;
 
-            const double lighting_fade_in_duration = 50;
-            Color4 lightingColour = accentColour.Value.Lighten(0.9f);
+            const double lighting_fade_in_duration = 70;
+            Color4 lightingColour = getLightingColour();
 
             background
-                .FadeTo(1, 40).Then()
-                .FadeTo(0.8f, 150, Easing.OutQuint);
+                .FadeTo(1, lighting_fade_in_duration, Easing.OutQuint)
+                .Then()
+                .FadeTo(0.6f, 500, Easing.In);
 
             hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
             hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
-                Colour = lightingColour.Opacity(0.7f),
+                Colour = lightingColour.Opacity(0.4f),
                 Radius = 20,
             }, lighting_fade_in_duration, Easing.OutQuint);
 
@@ -210,7 +211,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 circle.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
-                    Colour = lightingColour.Opacity(0.3f),
+                    Colour = lightingColour.Opacity(0.2f),
                     Radius = 60,
                 }, lighting_fade_in_duration, Easing.OutQuint);
             }
@@ -222,10 +223,14 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
         {
             if (e.Action != column.Action.Value) return;
 
-            const double lighting_fade_out_duration = 300;
-            Color4 lightingColour = accentColour.Value.Lighten(0.9f).Opacity(0);
+            const double lighting_fade_out_duration = 800;
 
-            background.FadeTo(0, lighting_fade_out_duration, Easing.OutQuint);
+            Color4 lightingColour = getLightingColour().Opacity(0);
+
+            // background fades out faster than lighting elements to give better definition to the player.
+            background.FadeTo(0.3f, 50, Easing.OutQuint)
+                      .Then()
+                      .FadeOut(lighting_fade_out_duration, Easing.OutQuint);
 
             topIcon.ScaleTo(1f, 200, Easing.OutQuint);
             topIcon.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters
@@ -255,5 +260,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 }, lighting_fade_out_duration, Easing.OutQuint);
             }
         }
+
+        private Color4 getLightingColour() => Interpolation.ValueAt(0.2f, accentColour.Value, Color4.White, 0, 1);
     }
 }

From c518fbf44a2bb03719fd2331c06bc3ca8cc52f76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 19:31:23 +0900
Subject: [PATCH 701/709] Adjust argon hold bodies to better define away from
 the stage background

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
index 10d5a4d267..7fbaf8ba64 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
             AccentColour.BindValueChanged(colour =>
             {
-                background.Colour = colour.NewValue.Opacity(0.2f);
+                background.Colour = colour.NewValue.Darken(1.5f);
                 foreground.Colour = colour.NewValue.Opacity(0.1f);
             }, true);
 

From 8101eea50dedc0a23bdd8bf63b12343be0bab97f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 20:04:39 +0900
Subject: [PATCH 702/709] Fix first glow of key area elements not working due
 to missing type

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index badca71f36..98e46c1eac 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                         Colour = OsuColour.Gray(196 / 255f),
                         Height = ArgonNotePiece.CORNER_RADIUS * 2,
                         Masking = true,
+                        EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow },
                     },
                     new Container
                     {
@@ -100,6 +101,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                         Size = new Vector2(icon_circle_size),
                                         Anchor = Anchor.BottomCentre,
                                         Origin = Anchor.Centre,
+                                        EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow },
                                     },
                                     new Circle
                                     {
@@ -108,6 +110,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                         Size = new Vector2(icon_circle_size),
                                         Anchor = Anchor.BottomCentre,
                                         Origin = Anchor.Centre,
+                                        EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow },
                                     },
                                     new Circle
                                     {
@@ -116,6 +119,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                         Size = new Vector2(icon_circle_size),
                                         Anchor = Anchor.BottomCentre,
                                         Origin = Anchor.Centre,
+                                        EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow },
                                     },
                                 }
                             },
@@ -128,6 +132,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                                 Masking = true,
                                 BorderThickness = 4,
                                 BorderColour = Color4.White,
+                                EdgeEffect = new EdgeEffectParameters { Type = EdgeEffectType.Glow },
                                 Children = new Drawable[]
                                 {
                                     new Box

From d5490523ea8dd4a8f6d16541ff9ef61bc6d75efb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 20:05:08 +0900
Subject: [PATCH 703/709] Adjust hold notes further

---
 .../Skinning/Argon/ArgonHoldBodyPiece.cs         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
index 7fbaf8ba64..c4b2181879 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK.Graphics;
 
@@ -16,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
     /// <summary>
     /// Represents length-wise portion of a hold note.
     /// </summary>
-    public class ArgonHoldBodyPiece : CompositeDrawable
+    public class ArgonHoldBodyPiece : CompositeDrawable, IHoldNoteBody
     {
         protected readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
         protected readonly IBindable<bool> IsHitting = new Bindable<bool>();
@@ -26,7 +27,6 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
         public ArgonHoldBodyPiece()
         {
-            Blending = BlendingParameters.Additive;
             RelativeSizeAxes = Axes.Both;
 
             // Without this, the width of the body will be slightly larger than the head/tail.
@@ -52,14 +52,14 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             {
                 var holdNote = (DrawableHoldNote)drawableObject;
 
-                AccentColour.BindTo(drawableObject.AccentColour);
+                AccentColour.BindTo(holdNote.AccentColour);
                 IsHitting.BindTo(holdNote.IsHitting);
             }
 
             AccentColour.BindValueChanged(colour =>
             {
                 background.Colour = colour.NewValue.Darken(1.5f);
-                foreground.Colour = colour.NewValue.Opacity(0.1f);
+                foreground.Colour = colour.NewValue.Opacity(0.2f);
             }, true);
 
             IsHitting.BindValueChanged(hitting =>
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                     using (foreground.BeginDelayedSequence(synchronisedOffset))
                     {
                         foreground.FadeTo(1, animation_length).Then()
-                                  .FadeTo(0, animation_length)
+                                  .FadeTo(0.5f, animation_length)
                                   .Loop();
                     }
                 }
@@ -86,5 +86,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
                 }
             });
         }
+
+        public void Recycle()
+        {
+            foreground.ClearTransforms();
+            foreground.Alpha = 0;
+        }
     }
 }

From 589b764b77803f65f5807b1cabd4efefd73a9de6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 20:30:38 +0900
Subject: [PATCH 704/709] Final tweaks because I don't know when to stop

---
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
index 98e46c1eac..7670c9bdf2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonKeyArea.cs
@@ -189,9 +189,10 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             Color4 lightingColour = getLightingColour();
 
             background
+                .FlashColour(accentColour.Value.Lighten(0.8f), 200, Easing.OutQuint)
                 .FadeTo(1, lighting_fade_in_duration, Easing.OutQuint)
                 .Then()
-                .FadeTo(0.6f, 500, Easing.In);
+                .FadeTo(0.8f, 500);
 
             hitTargetLine.FadeColour(Color4.White, lighting_fade_in_duration, Easing.OutQuint);
             hitTargetLine.TransformTo(nameof(EdgeEffect), new EdgeEffectParameters

From 588713497ddab075e99ae4dd123d0a7c82a4bce8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 20:43:26 +0900
Subject: [PATCH 705/709] Attempt to make hold notes more legible at low
 background dims

---
 .../Skinning/Argon/ArgonColumnBackground.cs                    | 2 +-
 osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
index bfa3b34890..598a765d3c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonColumnBackground.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             accentColour = column.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(colour =>
             {
-                background.Colour = colour.NewValue.Darken(3).Opacity(0.6f);
+                background.Colour = colour.NewValue.Darken(3).Opacity(0.8f);
                 brightColour = colour.NewValue.Opacity(0.6f);
                 dimColour = colour.NewValue.Opacity(0);
             }, true);
diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
index c4b2181879..757190c4ae 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldBodyPiece.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
             // Without this, the width of the body will be slightly larger than the head/tail.
             Masking = true;
             CornerRadius = ArgonNotePiece.CORNER_RADIUS;
+            Blending = BlendingParameters.Additive;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -58,7 +59,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon
 
             AccentColour.BindValueChanged(colour =>
             {
-                background.Colour = colour.NewValue.Darken(1.5f);
+                background.Colour = colour.NewValue.Darken(1.2f);
                 foreground.Colour = colour.NewValue.Opacity(0.2f);
             }, true);
 

From e1e12f41e94c2fe7909048867ca217a414bbae51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 21:00:02 +0900
Subject: [PATCH 706/709] Add more comprehensive inline comment

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index be26c41ceb..3d46bdaa7b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -71,15 +71,14 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
+            SkinnableDrawable keyArea;
+
             skin.SourceChanged += onSourceChanged;
             onSourceChanged();
 
             Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both,
-                // This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
-                Clock = host.UpdateThread.Clock,
-                ProcessCustomClock = false,
             };
 
             InternalChildren = new[]
@@ -89,18 +88,18 @@ namespace osu.Game.Rulesets.Mania.UI
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
                 HitObjectArea,
-                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
+                keyArea = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both,
-                    // This is pretty dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
-                    Clock = host.UpdateThread.Clock,
-                    ProcessCustomClock = false,
                 },
                 background,
                 TopLevelContainer,
                 new ColumnTouchInputArea(this)
             };
 
+            applyGameWideClock(background);
+            applyGameWideClock(keyArea);
+
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
             RegisterPool<Note, DrawableNote>(10, 50);
@@ -108,6 +107,18 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
             RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
             RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
+
+            // Some elements don't handle rewind correctly and fixing them is non-trivial.
+            // In the future we need a better solution to this, but as a temporary work-around, give these components the game-wide
+            // clock so they don't need to worry about rewind.
+            // This only works because they handle OnPressed/OnReleased which results in a correct state while rewinding.
+            //
+            // This is kinda dodgy (and will cause weirdness when pausing gameplay) but is better than completely broken rewind.
+            void applyGameWideClock(Drawable drawable)
+            {
+                drawable.Clock = host.UpdateThread.Clock;
+                drawable.ProcessCustomClock = false;
+            }
         }
 
         private void onSourceChanged()

From 072b64b8d4d7cc68002e4caaafba18512ae19a65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 21:16:11 +0900
Subject: [PATCH 707/709] Update all dependencies

---
 ...su.Game.Rulesets.EmptyFreeform.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj    |  4 ++--
 ...u.Game.Rulesets.EmptyScrolling.Tests.csproj |  4 ++--
 .../osu.Game.Rulesets.Pippidon.Tests.csproj    |  4 ++--
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj |  4 ++--
 .../osu.Game.Rulesets.Catch.Tests.csproj       |  4 ++--
 .../osu.Game.Rulesets.Mania.Tests.csproj       |  4 ++--
 .../osu.Game.Rulesets.Osu.Tests.csproj         |  4 ++--
 .../osu.Game.Rulesets.Taiko.Tests.csproj       |  4 ++--
 osu.Game.Tests/osu.Game.Tests.csproj           |  6 +++---
 .../osu.Game.Tournament.Tests.csproj           |  4 ++--
 osu.Game/osu.Game.csproj                       | 18 +++++++++---------
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
index b8604169aa..936808f38b 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -9,9 +9,9 @@
       <GenerateProgramFile>false</GenerateProgramFile>
     </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index 4117452579..35e7742172 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
index 0b119c8680..c1044965b5 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
index 4117452579..35e7742172 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -9,9 +9,9 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 36ffd3b5b6..d62d422f33 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index d45f8a9692..c9db824615 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index 2951076591..0d7b03d830 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index c2973644cf..1eb1c85d93 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index e8eaff4368..38e61f5624 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 2572864e09..bdf8cc5136 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
-    <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="DeepEqual" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 5512b26863..bdef46a6b2 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -4,9 +4,9 @@
     <StartupObject>osu.Game.Tournament.Tests.TournamentTestRunner</StartupObject>
   </PropertyGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 26738673c8..efdb6c6995 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,15 +18,15 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="AutoMapper" Version="11.0.1" />
+    <PackageReference Include="AutoMapper" Version="12.0.0" />
     <PackageReference Include="DiffPlex" Version="1.7.1" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="MessagePack" Version="2.4.35" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.8" />
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="5.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.9" />
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -34,13 +34,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="10.15.1" />
+    <PackageReference Include="Realm" Version="10.17.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.1005.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1005.0" />
-    <PackageReference Include="Sentry" Version="3.20.1" />
+    <PackageReference Include="Sentry" Version="3.22.0" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.1" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>

From cac5e734951d96101b931eb044bcc6811783a1c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 21:28:25 +0900
Subject: [PATCH 708/709] Update props references

---
 osu.Android.props | 2 +-
 osu.iOS.props     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c0be002bb5..2a678f1c61 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -56,6 +56,6 @@
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
-    <PackageReference Include="Realm" Version="10.15.1" />
+    <PackageReference Include="Realm" Version="10.17.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index af1e21edab..47872e4ff7 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -83,10 +83,10 @@
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.1005.0" />
-    <PackageReference Include="SharpCompress" Version="0.32.1" />
+    <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.429.0" ExcludeAssets="all" />
-    <PackageReference Include="Realm" Version="10.15.1" />
+    <PackageReference Include="Realm" Version="10.17.0" />
   </ItemGroup>
 </Project>

From cff38e532a6be67e444b12df77dbfd5faabc90a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Oct 2022 22:56:38 +0900
Subject: [PATCH 709/709] Attempt to remove console output

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33ec3d6602..56b3ebe87b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
         run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
 
       - name: Test
-        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx"
+        run: dotnet test $pwd/**/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" -- NUnit.ConsoleOut=0
         shell: pwsh
 
       # Attempt to upload results even if test fails.